[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [12223] fix search
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [12223] fix search |
Date: |
Thu, 23 Oct 2014 08:19:50 +0000 |
Revision: 12223
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=12223
Author: sigurdne
Date: 2014-10-23 08:19:50 +0000 (Thu, 23 Oct 2014)
Log Message:
-----------
fix search
Modified Paths:
--------------
branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
Modified: branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
2014-10-23 08:18:10 UTC (rev 12222)
+++ branches/dev-syncromind/property/inc/class.socondition_survey.inc.php
2014-10-23 08:19:50 UTC (rev 12223)
@@ -86,7 +86,7 @@
if($query)
{
$query =
$this->_db->db_addslashes($query);
- $querymethod = " {$where} {$table}.title
{$this->_like} '%{$query}%'";
+ $querymethod = " {$where} {$table}.title
{$this->_like} '%{$query}%' OR {$table}.address {$this->_like} '%{$query}%'";
}
$groupmethod = "GROUP BY $table.id, $table.title,
$table.descr, $table.address, $table.entry_date, $table.user_id, org_name,
$table.multiplier";
Modified: branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
2014-10-23 08:18:10 UTC (rev 12222)
+++ branches/dev-syncromind/property/inc/class.uicondition_survey.inc.php
2014-10-23 08:19:50 UTC (rev 12223)
@@ -320,7 +320,7 @@
$params = array(
'start' => phpgw::get_var('start', 'int',
'REQUEST', 0),
'results' => phpgw::get_var('length', 'int',
'REQUEST', 0),
- 'query' => $search,
+ 'query' => $search['value'],
'sort' => phpgw::get_var('sort'),
'dir' => phpgw::get_var('dir'),
'cat_id' => phpgw::get_var('cat_id', 'int',
'REQUEST', 0),
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [12223] fix search,
Sigurd Nes <=