From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 18 Sep 2008 03:20:11 +0000 (+0100)
Subject: properly handle OR clauses in labels when generating headlines list (closes #220)
X-Git-Tag: 1.2.27~6
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=4bc311fcb7de30d385f2a88d1232a485666d9b29;p=tt-rss.git

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

diff --git a/functions.php b/functions.php
index 777ec32c..2c830900 100644
--- 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