diff options
| author | Andrew Dolgov <fox@madoka.volgo-balt.ru> | 2013-05-07 15:36:14 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@madoka.volgo-balt.ru> | 2013-05-07 15:36:14 +0400 |
| commit | 82076ce53113be9cc053f8740356e7e1b81e5643 (patch) | |
| tree | 5eba36805f593ec7dd0aad671b5bcca0ae01cf53 /classes/backend.php | |
| parent | 66af65f14b4f3c670bb3f9ca7b1c80081f9281d1 (diff) | |
| parent | 23923fb29b345c1eea5b70a6df4d30395425bf37 (diff) | |
Merge branch 'master' into css-feedtree-counter
Conflicts:
tt-rss.css
Diffstat (limited to 'classes/backend.php')
| -rw-r--r-- | classes/backend.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/backend.php b/classes/backend.php index c03d583db..7737df0f6 100644 --- a/classes/backend.php +++ b/classes/backend.php @@ -11,7 +11,7 @@ class Backend extends Handler { require_once "digest.php"; - $rv = prepare_headlines_digest($this->link, $_SESSION['uid'], 1, 1000); + $rv = prepare_headlines_digest($_SESSION['uid'], 1, 1000); $rv[3] = "<pre>" . $rv[3] . "</pre>"; @@ -19,8 +19,8 @@ class Backend extends Handler { } private function display_main_help() { - $info = get_hotkeys_info($this->link); - $imap = get_hotkeys_map($this->link); + $info = get_hotkeys_info(); + $imap = get_hotkeys_map(); $omap = array(); foreach ($imap[1] as $sequence => $action) { |