espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.3.2'

Browse Source
This commit is contained in:
yuri
2016-12-26 11:15:55 +02:00
parent da74c37ab1 1975d16f3a
commit a003efe7c9
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/ORM/DB/Mapper.php
+5 -3
View File
@@ -358,7 +358,7 @@ abstract class Mapper implements IMapper
$setArr = array();
foreach ($columnData as $column => $value) {
$setArr[] = "`".$this->toDb($column) . "` = " . $this->pdo->quote($value);
$setArr[] = "`".$this->toDb($column) . "` = " . $this->quote($value);
}
if (empty($setArr)) {
return true;
@@ -542,14 +542,14 @@ abstract class Mapper implements IMapper
if (!empty($relOpt['conditions']) && is_array($relOpt['conditions'])) {
foreach ($relOpt['conditions'] as $f => $v) {
$fieldsPart .= ", " . $this->toDb($f);
$valuesPart .= ", " . $this->pdo->quote($v);
$valuesPart .= ", " . $this->quote($v);
}
}
if (!empty($data) && is_array($data)) {
foreach ($data as $column => $columnValue) {
$fieldsPart .= ", " . $this->toDb($column);
$valuesPart .= ", " . $this->pdo->quote($columnValue);
$valuesPart .= ", " . $this->quote($columnValue);
}
}
@@ -700,6 +700,8 @@ abstract class Mapper implements IMapper
{
if (is_null($value)) {
return 'NULL';
} else if (is_bool($value)) {
return $value ? '1' : '0';
} else {
return $this->pdo->quote($value);
}
application/Espo/ORM/DB/Query/Base.php
+2
View File
@@ -500,6 +500,8 @@ abstract class Base
{
if (is_null($value)) {
return 'NULL';
} else if (is_bool($value)) {
return $value ? '1' : '0';
} else {
return $this->pdo->quote($value);
}