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

Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e 

Change update.php shebang to support any in-path installation locatio…
Fix category count query for mysql
This commit is contained in:
Andrew Dolgov 2012-06-21 21:08:28 -07:00
parent 82ace1aba8 7e454e815d
commit 40b67ac7c7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/pref_feeds.php
View File

@ -1192,7 +1192,7 @@ class Pref_Feeds extends Protected_Handler {
print "</div>"; 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 FROM ttrss_feed_categories AS c LEFT JOIN ttrss_feeds AS f ON
(f.cat_id = c.id) (f.cat_id = c.id)
WHERE c.owner_uid = ".$_SESSION["uid"]." WHERE c.owner_uid = ".$_SESSION["uid"]."

2
update.php
View File

@ -1,4 +1,4 @@
#!/usr/bin/php #!/usr/bin/env php
<?php <?php
set_include_path(get_include_path() . PATH_SEPARATOR . set_include_path(get_include_path() . PATH_SEPARATOR .
dirname(__FILE__) . "/include"); dirname(__FILE__) . "/include");