[Tikiwiki-cvs] tiki/lib tikilib.php,1.801.2.74,1.801.2.75

[<sy...@us...>]

Update of /cvsroot/tikiwiki/tiki/lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31458/lib

Modified Files:
      Tag: BRANCH-1-10
	tikilib.php 
Log Message:
[FIX]wiki: do not create a where clause if empty

Index: tikilib.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/lib/tikilib.php,v
retrieving revision 1.801.2.74
retrieving revision 1.801.2.75
diff -u -d -r1.801.2.74 -r1.801.2.75
--- tikilib.php	5 Feb 2008 17:15:14 -0000	1.801.2.74
+++ tikilib.php	5 Feb 2008 21:17:32 -0000	1.801.2.75
@@ -3511,7 +3511,6 @@
 	}
 
 	if (!empty($filter)) {
-		$mid .= empty($mid) ? ' where (' : ' and (';
 		$tmp_mid = '';
 		foreach ($filter as $type=>$val) {
 			if ($type == 'categId') {
@@ -3526,7 +3525,10 @@
 				$select .= ',ts.`page_alias`';
 			}
 		}
-		$mid .= $tmp_mid.')';
+		if (!empty($tmp_mid)) {
+			$mid .= empty($mid) ? ' where (' : ' and (';
+			$mid .= $tmp_mid.')';
+		}
 	}
 	if (!empty($initial)) {
 		$mid .= empty($mid) ? ' where (' : ' and (';