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

Merge 3.5.7

Browse Source
This commit is contained in:
Romain Neutron
2012-01-03 15:26:07 +01:00
parent 60588e4c69 b6899e6d3f
commit af9330b17e
28 changed files with 43087 additions and 42105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/module/report/sqlfilter.class.php
View File

@@ -46,7 +46,7 @@ class module_report_sqlfilter
$coll_filter = array();
foreach (explode(',', $list_coll_id) as $val)
{
$coll_filter [] = " position('," . (int) $val . ",' in concat(',' ,coll_list, ',')) > 0 ";
$coll_filter [] = " position('," . phrasea::collFromBas($val) . ",' in concat(',' ,coll_list, ',')) > 0 ";
}
$ret['sql'] = implode(' OR ', $coll_filter);
@@ -207,7 +207,7 @@ class module_report_sqlfilter
{
foreach ($tab as $val)
{
$coll_filter[] = " position('," . (int) $val . ",' in concat(',' ,coll_list, ',')) > 0 ";
$coll_filter[] = " position('," . phrasea::collFromBas($val) . ",' in concat(',' ,coll_list, ',')) > 0 ";
}
$this->filter['collection'] = array('sql' => implode(' OR ', $coll_filter), 'params' => array());
}
@@ -226,7 +226,7 @@ class module_report_sqlfilter
foreach ($tab as $val)
{
$dl_coll_filter[] = "record.coll_id = :record_fil" . $n;
$params[":record_fil" . $n] = $val;
$params[":record_fil" . $n] = phrasea::collFromBas($val);
$n++;
}
$this->filter['record'] = array('sql' => implode(' OR ', $dl_coll_filter), 'params' => $params);