summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2012-06-21 21:08:28 -0700
committerAndrew Dolgov <[email protected]>2012-06-21 21:08:28 -0700
commit40b67ac7c7de479a4dc04c8a42a410464dd1aa4c (patch)
treee44d4a85772580d4c9ce3dddaf5ccc19a0ea292e /classes
parent82ace1aba8bf2834b910299e854b802dcc8ea7cf (diff)
parent7e454e815dd67f0ac3804e213599be9bbbc2755e (diff)
Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e
Change update.php shebang to support any in-path installation locatio… Fix category count query for mysql
Diffstat (limited to 'classes')
-rw-r--r--classes/pref_feeds.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index bf9f18a94..1f875ba12 100644
--- a/classes/pref_feeds.php
+++ b/classes/pref_feeds.php
@@ -1192,7 +1192,7 @@ class Pref_Feeds extends Protected_Handler {
print "</div>";
- $result = db_query($this->link, "SELECT c.title, c.id,COUNT(f.*) AS count
+ $result = db_query($this->link, "SELECT c.title, c.id,COUNT(f.id) AS count
FROM ttrss_feed_categories AS c LEFT JOIN ttrss_feeds AS f ON
(f.cat_id = c.id)
WHERE c.owner_uid = ".$_SESSION["uid"]."