hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-11 03:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix filter issue when phrasea::collFromBase return empty string

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-11-13 20:32:08 +01:00
parent 04db822635
commit dc6976d04a
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/classes/module/report/sqlfilter.php
View File

@@ -48,8 +48,9 @@ class module_report_sqlfilter
$ret = array('sql' => '', 'params' => array()); $ret = array('sql' => '', 'params' => array());
$coll_filter = array(); $coll_filter = array();
foreach (array_filter(explode(',', $list_coll_id)) as $val) { foreach (array_filter(explode(',', $list_coll_id)) as $val) {
if( false !== $val = phrasea::collFromBas($app, $val)) { $val = \phrasea::collFromBas($app, $val);
$coll_filter[] = 'log_colls.coll_id = '.phrasea::collFromBas($app, $val); if(!!$val) {
$coll_filter[] = 'log_colls.coll_id = ' . $val;
} }
} }
$ret['sql'] = ' (' . implode(' OR ', array_unique($coll_filter)) . ') '; $ret['sql'] = ' (' . implode(' OR ', array_unique($coll_filter)) . ') ';
@@ -196,8 +197,9 @@ class module_report_sqlfilter
if (count($tab) > 0) { if (count($tab) > 0) {
foreach ($tab as $val) { foreach ($tab as $val) {
if( false !== $val = phrasea::collFromBas($this->app, $val)) { $val = \phrasea::collFromBas($this->app, $val);
$coll_filter[] = 'log_colls.coll_id = '.phrasea::collFromBas($this->app, $val); if(!!$val) {
$coll_filter[] = 'log_colls.coll_id = ' . $val;
} }
} }