properly handle OR clauses in labels when generating headlines list (closes #220)

diff --git a/functions.php b/functions.php
index 777ec32c985f619f94cdbde68674502857556900..2c8309003368deffde42e2e16bd2ec0561a307fc 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -3253,7 +3253,7 @@
                                $tmp_result = db_query($link, "SELECT sql_exp FROM ttrss_labels
                                        WHERE id = '$label_id'");
                        
-                               $query_strategy_part = db_fetch_result($tmp_result, 0, "sql_exp");
+                               $query_strategy_part = "(" . db_fetch_result($tmp_result, 0, "sql_exp") . ")";
 
                                if (!$query_strategy_part) {
                                        return false;
@@ -3392,10 +3392,10 @@
                                        $view_query_part
                                        $query_strategy_part ORDER BY $order_by
                                        $limit_query_part $offset_query_part";
-                                       
-                               $result = db_query($link, $query);
-       
+
                                if ($_GET["debug"]) print $query;
+
+                               $result = db_query($link, $query);
        
                        } else {
                                // browsing by tag