X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=1d804985bff59a491343a73c0965bb81050f7169;hb=46c5dc49d75f51084402491bfddbd69c306fce2d;hp=55ef6777d5d004a40c4fbcfa8c82cadde687713c;hpb=de366f0cb00cba0860b18a26a6d1bc01f5ee6251;p=fa-stable.git

diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc
index 55ef6777..1d804985 100644
--- a/includes/ui/ui_lists.inc
+++ b/includes/ui/ui_lists.inc
@@ -150,7 +150,7 @@ $opts = array(		// default options
 					foreach($opts['search'] as $i=> $s)
 						$opts['search'][$i] = $s . " LIKE "
 							.db_escape(($class=='combo3' ? '' : '%').$txt.'%');
-					$opts['where'][] = '('. implode($opts['search'], ' OR ') . ')';
+					$opts['where'][] = '('. implode(' OR ', $opts['search']) . ')';
 				}
 		}
 	}
@@ -158,7 +158,7 @@ $opts = array(		// default options
 	// sql completion
 	if (count($opts['where'])) {
 		$where = strpos($sql, 'WHERE')==false ? ' WHERE ':' AND ';
-		$where .= '('. implode($opts['where'], ' AND ') . ')';
+		$where .= '('. implode(' AND ', $opts['where']) . ')';
 		$group_pos = strpos($sql, 'GROUP BY');
 		if ($group_pos) {
 			$group = substr($sql, $group_pos);
@@ -2310,7 +2310,7 @@ function quick_entries_list($name, $selected_id=null, $type=null, $submit_on_cha
 
 }
 
-function quick_entries_list_cells($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_cells($label, $name, $selected_id, $type, $submit_on_change=false)
 {
 	if ($label != null)
 		echo "<td>$label</td>\n";
@@ -2319,7 +2319,7 @@ function quick_entries_list_cells($label, $name, $selected_id=null, $type, $subm
 	echo "</td>";
 }
 
-function quick_entries_list_row($label, $name, $selected_id=null, $type, $submit_on_change=false)
+function quick_entries_list_row($label, $name, $selected_id, $type, $submit_on_change=false)
 {
 	echo "<tr><td class='label'>$label</td>";
 	quick_entries_list_cells(null, $name, $selected_id, $type, $submit_on_change);