diff options
author | Andrew Dolgov <[email protected]> | 2017-12-02 14:02:01 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2017-12-02 14:02:01 +0300 |
commit | 7ccb4e91ff45cab907b43de1cc36a3b0ab5a025d (patch) | |
tree | 96895e4c37fe3263839139a46e62880959465c75 | |
parent | 248c62a1cc9fe54255dbf27a56d02ac398a7a588 (diff) |
boolean handling changes which probably won't break everything
-rw-r--r-- | classes/opml.php | 2 | ||||
-rw-r--r-- | include/functions.php | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/classes/opml.php b/classes/opml.php index 03156b79f..5f70558b6 100644 --- a/classes/opml.php +++ b/classes/opml.php @@ -364,6 +364,8 @@ class Opml extends Handler_Protected { $inverse = bool_to_sql_bool($filter["inverse"]); $title = $filter["title"]; + print "F: $title, $inverse, $enabled, $match_any_rule"; + $sth = $this->pdo->prepare("INSERT INTO ttrss_filters2 (match_any_rule,enabled,inverse,title,owner_uid) VALUES (?, ?, ?, ?, ?)"); diff --git a/include/functions.php b/include/functions.php index 31a0300d7..0b301b82e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -941,19 +941,11 @@ } function sql_bool_to_bool($s) { - if ($s == "t" || $s == "1" || strtolower($s) == "true") { - return true; - } else { - return false; - } + return $s; //no-op for PDO } function bool_to_sql_bool($s) { - if ($s) { - return "true"; - } else { - return "false"; - } + return (bool)$s; //no-op for PDO } // Session caching removed due to causing wrong redirects to upgrade |