diff options
| -rw-r--r-- | backend.php | 53 | ||||
| -rw-r--r-- | functions.php | 5 |
2 files changed, 41 insertions, 17 deletions
diff --git a/backend.php b/backend.php index ce2e73d85..90f4cfcd2 100644 --- a/backend.php +++ b/backend.php @@ -238,31 +238,50 @@ print "<headlines id=\"$feed\"><![CDATA["; - $ret = outputHeadlinesList($link, $feed, $subop, - $view_mode, $limit, $cat_view, $next_unread_feed, $offset); + if ($feed == -4) { - $topmost_article_ids = $ret[0]; - $headlines_count = $ret[1]; - $returned_feed = $ret[2]; - $disable_cache = $ret[3]; + print "<div id=\"headlinesContainer\">"; - print "]]></headlines>"; + print "PLACEHOLDER"; - print "<headlines-count value=\"$headlines_count\"/>"; + print "</div>"; - $headlines_unread = getFeedUnread($link, $returned_feed); + print "]]></headlines>"; + print "<headlines-count value=\"0\"/>"; + print "<headlines-unread value=\"0\"/>"; + print "<disable-cache value=\"0\"/>"; - print "<headlines-unread value=\"$headlines_unread\"/>"; - printf("<disable-cache value=\"%d\"/>", $disable_cache); + print "<articles>"; + print "</articles>"; - if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info); + } else { - if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) { - print "<articles>"; - foreach ($topmost_article_ids as $id) { - outputArticleXML($link, $id, $feed, false); + $ret = outputHeadlinesList($link, $feed, $subop, + $view_mode, $limit, $cat_view, $next_unread_feed, $offset); + + $topmost_article_ids = $ret[0]; + $headlines_count = $ret[1]; + $returned_feed = $ret[2]; + $disable_cache = $ret[3]; + + print "]]></headlines>"; + + print "<headlines-count value=\"$headlines_count\"/>"; + + $headlines_unread = getFeedUnread($link, $returned_feed); + + print "<headlines-unread value=\"$headlines_unread\"/>"; + printf("<disable-cache value=\"%d\"/>", $disable_cache); + + if ($_GET["debug"]) $timing_info = print_checkpoint("10", $timing_info); + + if (is_array($topmost_article_ids) && !get_pref($link, 'COMBINED_DISPLAY_MODE')) { + print "<articles>"; + foreach ($topmost_article_ids as $id) { + outputArticleXML($link, $id, $feed, false); + } + print "</articles>"; } - print "</articles>"; } if ($_GET["debug"]) $timing_info = print_checkpoint("20", $timing_info); diff --git a/functions.php b/functions.php index 1ca8169af..71b613bef 100644 --- a/functions.php +++ b/functions.php @@ -4004,6 +4004,11 @@ printCategoryHeader($link, -1, $cat_hidden, false); } + if (defined('_ENABLE_DASHBOARD')) { + printFeedEntry(-4, "virt", __("Dashboard"), 0, + "images/tag.png", $link); + } + $num_starred = getFeedUnread($link, -1); $num_published = getFeedUnread($link, -2); $num_fresh = getFeedUnread($link, -3); |