Merge branch 'upstream/pdo-experimental' of JustAMacUser/tt-rss into pdo-experimental

diff --git a/classes/pref/filters.php b/classes/pref/filters.php
index a9d1557bc9083c9850bcb9979f67c35508c5a383..f24d0a01bc77e085bc5a4c2270837b6685b2e96a 100755 (executable)
--- a/classes/pref/filters.php
+++ b/classes/pref/filters.php
@@ -696,7 +696,7 @@ class Pref_Filters extends Handler_Protected {
                                if ($rule) {
 
                                        $reg_exp = trim($rule["reg_exp"]);
-                                       $inverse = isset($rule["inverse"]) ? true : false;
+                                       $inverse = isset($rule["inverse"]) ? 1 : 0;
 
                                        $filter_type = (int)trim($rule["filter_type"]);
                                        $match_on = json_encode($rule["feed_id"]);

diff --git a/include/functions.php b/include/functions.php
index 459762d58ea7c4b2fac427f71aad0fc82abf23c1..21cf3fef8372c9094e3d7f6edf56b0f2c63b6a39 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -941,7 +941,7 @@
        }
 
        function sql_bool_to_bool($s) {
-               return $s && ($s != "f" && $s != "false"); //no-op for PDO, backwards compat for legacy layer
+               return $s && ($s !== "f" && $s !== "false"); //no-op for PDO, backwards compat for legacy layer
        }
 
        function bool_to_sql_bool($s) {