Page 1 of 1

A couple of minor bugfixes

Posted: 21 Jun 2012, 20:02
by fluffy
I've fixed a couple of bugs that I've come across, and have them on a publicly-visible git repo. Is there a specific procedure I should use to make a pull request? (I've never done that before, despite using git at work.)

Here is the output of git request-pull, in any case:

Code: Select all

The following changes since commit 917c12ee30e5db223114314def15be9a77c9be71:

  show empty categories in italic in category editor (2012-06-15 12:24:41 +0400)

are available in the git repository at: master

fluffy (2):
      Change update.php shebang to support any in-path installation location for php
      Fix category count query for mysql

 classes/pref_feeds.php |    2 +-
 update.php             |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/pref_feeds.php b/classes/pref_feeds.php
index bf9f18a..1f875ba 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,,COUNT(f.*) AS count
+      $result = db_query($this->link, "SELECT c.title,,COUNT( AS count
          FROM ttrss_feed_categories AS c LEFT JOIN ttrss_feeds AS f ON
             (f.cat_id =
          WHERE c.owner_uid = ".$_SESSION["uid"]."
diff --git a/update.php b/update.php
index 68add9f..44c39b6 100755
--- a/update.php
+++ b/update.php
@@ -1,4 +1,4 @@
+#!/usr/bin/env php
    set_include_path(get_include_path() . PATH_SEPARATOR .
       dirname(__FILE__) . "/include");

Re: A couple of minor bugfixes

Posted: 21 Jun 2012, 20:32
by fox
If that's individual commits you want to include you can just tell me which ones to cherry-pick, otherwise you might want to go the separate branch route. I've only dealt with pull requests on github, they have a fancy UI for them. :)

Re: A couple of minor bugfixes

Posted: 21 Jun 2012, 22:13
by fluffy
Well, I'd like both commits to be included, but they're both at your discretion, of course. I'll push my feature/fluffy-hacks branch up to that repo if that's what you'd prefer (I hate working in master anyway - gets too confusing).

In any case, if you'd like to pull commits 7e454e815dd67f0ac3804e213599be9bbbc2755e (category count fix for mysql) and ece7871113892e324c46a83f9628bdb74a0d92ca (update.php's shebang), be my guest. :)

I guess I should break down and finally sign up for github.

[EDIT] Oh wow, I totally forgot I signed up for it a long time ago and just never bothered to use it. Jeeze.

Re: A couple of minor bugfixes

Posted: 21 Jun 2012, 22:31
by fluffy
Okay, I just got this going through github. Hopefully this isn't too stupidly confusing.