X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_lists.inc;h=5ca6a49d4c84da915ff56dcc4c3e8b85b173fcd8;hb=66cfb670d9261ad0364a91822dc0766de1620799;hp=c70343af04c318171ce94c63fa804645781fcc74;hpb=99b2a5de9ef5ac1cbf73a597b5870da20d7c6b79;p=fa-stable.git diff --git a/includes/ui/ui_lists.inc b/includes/ui/ui_lists.inc index c70343af..5ca6a49d 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); @@ -365,7 +365,7 @@ $opts = array( // default options $selector .= ' '.$opts['editlink']; if ($search_box && $opts['cells']) - $str = ($edit_entry!='' ? "