valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

format_headlines_list: fix pg_num_rows() called incorrectly when firstid check failed

This commit is contained in:
Andrew Dolgov 2015-12-05 04:04:44 +03:00
parent 24e6ff5d1c
commit f61f2a2699
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
classes/feeds.php
View File

@ -280,19 +280,7 @@ class Feeds extends Handler_Protected {
$feed, $cat_view, $search, $view_mode,
$last_error, $last_updated);
$headlines_count = $this->dbh->num_rows($result);
/* if (get_pref('COMBINED_DISPLAY_MODE')) {
$button_plugins = array();
foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
$pclass = "button_" . trim($p);
if (class_exists($pclass)) {
$plugin = new $pclass();
array_push($button_plugins, $plugin);
}
}
} */
$headlines_count = is_numeric($result) ? 0 : $this->dbh->num_rows($result);
if ($offset == 0) {
foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_HEADLINES_BEFORE) as $p) {
@ -302,7 +290,7 @@ class Feeds extends Handler_Protected {
$reply['content'] = '';
if (!is_numeric($result) && $this->dbh->num_rows($result) > 0) {
if ($headlines_count > 0) {
$lnum = $offset;