mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-08 09:24:25 +03:00
Merge commit '2f72e9a801a8b8147ddc1f486a51f5a05381a9df' into framework
This commit is contained in:
parent
b8b3a822cb
commit
672b9f65d8
|
@ -231,7 +231,7 @@ class MapperORM extends Mapper {
|
||||||
$sFilterFields='';
|
$sFilterFields='';
|
||||||
foreach ($aFilterFields as $k => $v) {
|
foreach ($aFilterFields as $k => $v) {
|
||||||
$aK=explode(' ',trim($k));
|
$aK=explode(' ',trim($k));
|
||||||
$sFieldCurrent=$aK[0];
|
$sFieldCurrent=$this->oDb->escape($aK[0],true);
|
||||||
$sConditionCurrent=' = ';
|
$sConditionCurrent=' = ';
|
||||||
if (count($aK)>1) {
|
if (count($aK)>1) {
|
||||||
$sConditionCurrent=strtolower($aK[1]);
|
$sConditionCurrent=strtolower($aK[1]);
|
||||||
|
@ -273,7 +273,7 @@ class MapperORM extends Mapper {
|
||||||
} elseif (!in_array($value,array('asc','desc'))) {
|
} elseif (!in_array($value,array('asc','desc'))) {
|
||||||
$value='asc';
|
$value='asc';
|
||||||
}
|
}
|
||||||
$key = $oEntitySample->_getField($key);
|
$key = $this->oDb->escape($oEntitySample->_getField($key),true);
|
||||||
$sOrder.=" {$key} {$value},";
|
$sOrder.=" {$key} {$value},";
|
||||||
}
|
}
|
||||||
$sOrder=trim($sOrder,',');
|
$sOrder=trim($sOrder,',');
|
||||||
|
|
Loading…
Reference in a new issue