summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Unterkircher <unki@netshadow.at>2008-01-06 17:52:37 +0100
committerAndreas Unterkircher <unki@netshadow.at>2008-01-06 17:52:37 +0100
commit7d8b71f32de8ec781aff4641a9904a10e59828ff (patch)
treefdcf62c0af4f2b22f43477542019170f2579a535
parent3966667f0817ca935d214762830800f66b867855 (diff)
used AND to add a show_tag constrait, but in case there hasn't been issued
a WHERE query already a WHERE needs to be used instead of the AND Signed-off-by: Arun Persaud <arun@nubati.net> Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
-rw-r--r--phpfspot.class.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php
index cbb6fed..03fe9d4 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -877,7 +877,10 @@ class PHPFSPOT {
$query_str.= "WHERE ". $additional_where_cond ." ";
if(isset($this->cfg->show_tags) && !empty($this->cfg->show_tags)) {
- $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+ if(isset($additional_where_cond))
+ $query_str.= "AND t.name IN ('".implode("','",$this->cfg->show_tags). "')";
+ else
+ $query_str.= "WHERE t.name IN ('".implode("','",$this->cfg->show_tags). "')";
}
if(isset($order_str))