adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from roll4life/feature/uuid

Browse source 
refs #8027 combine if statements
This commit is contained in:
Jorge M. González Martín 2016-02-11 12:19:27 +00:00
commit 19fc6adbb3
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Model/Datasource/Database/Postgres.php
View file

@ -934,10 +934,8 @@ class Postgres extends DboSource {
*/
public function value($data, $column = null, $null = true) {
$value = parent::value($data, $column, $null);
if ($column === 'uuid' && is_scalar($data)) {
if ($data === '') {
return 'NULL';
}
if ($column === 'uuid' && is_scalar($data) && $data === '') {
return 'NULL';
}
return $value;
}