Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e

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

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"]."

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");