Index: trunk/kernel/include/parseditem.php =================================================================== diff -u -r120 -r123 --- trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 120) +++ trunk/kernel/include/parseditem.php (.../parseditem.php) (revision 123) @@ -1329,44 +1329,35 @@ $this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table"); } - - function AdminSearchWhereClause($SearchList) + function AdminSearchWhereClause($SearchList) { - $sql = ""; - if(!is_array($SearchList)) - { - $SearchList = explode(",",$SearchList); - } - - if(!count($SearchList) || !count($this->AdminSearchFields)) - return ""; + $sql = ""; + if( !is_array($SearchList) ) $SearchList = explode(",",$SearchList); + if( !count($SearchList) || !count($this->AdminSearchFields) ) return ''; - for($f=0;$fAdminSearchFields);$i++) - { - $field = $this->AdminSearchFields[$i]; - - if(strlen(trim($value))) - { - if(strlen($inner_sql)) - $inner_sql .= " OR "; - $inner_sql .= $field." LIKE '%".$value."%'"; - } - } - if(strlen($inner_sql)) - { - $sql .= "(".$inner_sql.") "; - if($fAdminSearchFields); $i++) + { + $field = $this->AdminSearchFields[$i]; + if( strlen( trim($value) ) ) + { + if( strlen($inner_sql) ) $inner_sql .= " OR "; + $inner_sql .= $field." LIKE '%".$value."%'"; + } + } + if( strlen($inner_sql) ) + { + $sql .= '('.$inner_sql.') '; + if($f < count($SearchList) - 1) $sql .= " AND "; + } + } + } + return $sql; } function BackupData($OutFileName,$Start,$Limit) @@ -1569,6 +1560,7 @@ if($objSession->HasSystemPermission("DEBUG.LIST")) echo $sql."
\n"; + return $this->Query_Item($sql); }