]> git.wh0rd.org - tt-rss.git/commitdiff
fix cat_filter parsed wrong on psql
authorAndrew Dolgov <fox@madoka.volgo-balt.ru>
Fri, 31 Aug 2012 08:24:13 +0000 (12:24 +0400)
committerAndrew Dolgov <fox@madoka.volgo-balt.ru>
Fri, 31 Aug 2012 08:24:13 +0000 (12:24 +0400)
classes/pref/filters.php
update.php

index 591d429eb346c88be2a982a747b695321409b6aa..f1a4c7fd1e61c9db3f8654dfeb1959758af8c903 100644 (file)
@@ -182,7 +182,7 @@ class Pref_Filters extends Handler_Protected {
                        WHERE filter_id = '$filter_id' ORDER BY id");
 
                while ($line = db_fetch_assoc($rules_result)) {
-                       if ($line["cat_filter"]) {
+                       if (sql_bool_to_bool($line["cat_filter"])) {
                                unset($line["cat_filter"]);
                                $line["feed_id"] = "CAT:" . (int)$line["cat_id"];
                                unset($line["cat_id"]);
@@ -385,6 +385,7 @@ class Pref_Filters extends Handler_Protected {
                                        $feed_id = db_escape_string(trim($rule["feed_id"]));
 
                                        if (strpos($feed_id, "CAT:") === 0) {
+
                                                $cat_filter = bool_to_sql_bool(true);
                                                $cat_id = (int) substr($feed_id, 4);
                                                $feed_id = "NULL";
@@ -806,7 +807,7 @@ class Pref_Filters extends Handler_Protected {
 
                while ($line = db_fetch_assoc($result)) {
 
-                       if ($line["cat_filter"]) {
+                       if (sql_bool_to_bool($line["cat_filter"])) {
                                unset($line["cat_filter"]);
                                $line["feed_id"] = "CAT:" . (int)$line["cat_id"];
                                unset($line["cat_id"]);
index 51930beab03c50efefdbb359362c1f7d0d0290ce..e8ef8bc99898a9bf61287b5052373f60e1d2928c 100755 (executable)
 
                        // Oh god it's full of hacks
 
+##                     print_r($filter);
+
                        $_REQUEST = $filter;
                        $_SESSION["uid"] = $owner_uid;