From: Andrew Dolgov <noreply@fakecake.org>
Date: Sat, 5 Dec 2015 01:04:44 +0000 (+0300)
Subject: format_headlines_list: fix pg_num_rows() called incorrectly when firstid check failed
X-Git-Tag: 16.3~73
X-Git-Url: https://git.wh0rd.org/?p=tt-rss.git;a=commitdiff_plain;h=f61f2a2699b01eaf80eb3dbe4ba21c496364498b

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

diff --git a/classes/feeds.php b/classes/feeds.php
index 7d12275d..eff66dda 100755
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -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;