From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 31 Aug 2012 08:24:13 +0000 (+0400)
Subject: fix cat_filter parsed wrong on psql
X-Git-Tag: 1.6.0~97
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=5451903ce33d21fa4901227a4021d44eb2e20535;p=tt-rss.git

fix cat_filter parsed wrong on psql
---

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index 591d429e..f1a4c7fd 100644
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -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"]);
diff --git a/update.php b/update.php
index 51930bea..e8ef8bc9 100755
--- a/update.php
+++ b/update.php
@@ -277,6 +277,8 @@
 
 			// Oh god it's full of hacks
 
+##			print_r($filter);
+
 			$_REQUEST = $filter;
 			$_SESSION["uid"] = $owner_uid;