Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e

Change update.php shebang to support any in-path installation locatio…
Fix category count query for mysql

diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index bf9f18a94c7e74e4f3147fa4d87ebff267f4630e..1f875ba1201a49b03f633953cef24d77f0ddd529 100644 (file)
--- 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"]."

diff --git a/update.php b/update.php
index 68add9f0ccfc34563c19db262373f868dd53abb1..44c39b6a883748184c6634ed725e3951d093aec0 100755 (executable)
--- a/update.php
+++ b/update.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
        set_include_path(get_include_path() . PATH_SEPARATOR .
                dirname(__FILE__) . "/include");