[Mapbender-commits] r6778 - trunk/mapbender/lib

[svn_mapbender at osgeo.org]

Author: christoph
Date: 2010-08-20 12:58:53 +0000 (Fri, 20 Aug 2010)
New Revision: 6778

Modified:
   trunk/mapbender/lib/class_Filter.php
Log:
error with complex filter and FALSE

Modified: trunk/mapbender/lib/class_Filter.php
===================================================================
--- trunk/mapbender/lib/class_Filter.php	2010-08-20 12:31:03 UTC (rev 6777)
+++ trunk/mapbender/lib/class_Filter.php	2010-08-20 12:58:53 UTC (rev 6778)
@@ -66,14 +66,16 @@
 		
 		if ($this->isComplex()) {
 			$i = $parameterCount;
+			$initialized = false;
 			foreach ($this->filterArray as $filter) {
 				$currentSqlObject = $filter->toSql($i);
 				
 				if ($currentSqlObject->sql === "") {
 					continue;
 				}
-				$currentBooleanOperator = ($i === $parameterCount) ? 
+				$currentBooleanOperator = (!$initialized) ? 
 					"" : " " . $this->booleanOperator . " ";
+				$initialized = true;
 				$sqlObject->sql .= $currentBooleanOperator . 
 					$currentSqlObject->sql;
 				$sqlObject->v = array_merge($sqlObject->v, $currentSqlObject->v);