Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-4496: Library -> Contents-feed does not work if advanced search data is invalid

Browse source 
-fixed
This commit is contained in:
denise 2012-09-19 16:39:56 -04:00
parent a0f5aa4b73
commit 2afc4183bb
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/models/Datatables.php
View file

@ -100,10 +100,12 @@ class Application_Model_Datatables
*/
$params = array();
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
if (!empty($advancedWhere['clause'])) {
$where[] = join(" AND ", $advancedWhere['clause']);
$params = $advancedWhere['params'];
if ($data['advSearch'] === 'true') {
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
if (!empty($advancedWhere['clause'])) {
$where[] = join(" AND ", $advancedWhere['clause']);
$params = $advancedWhere['params'];
}
}
if ($data["sSearch"] !== "") {