extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 07:09:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

1) corrected fix of wrong comparison with NULL in column_data_implode

Browse Source 
2) allow for null in array in column_data_implode
This commit is contained in:
Ralf Becker 2005-02-28 11:51:10 +00:00
parent 146a25179b
commit 37fa750990
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpgwapi/inc/class.db.inc.php
View File

@ -1116,17 +1116,25 @@
if (is_array($data)) if (is_array($data))
{ {
$or_null = '';
foreach($data as $k => $v) foreach($data as $k => $v)
{ {
if (!$not_null && $use_key===True && is_null($v))
{
$or_null = ' OR '.$this->name_quote($key).' IS NULL)';
unset($data[$k]);
continue;
}
$data[$k] = $this->quote($v,$column_type,$not_null); $data[$k] = $this->quote($v,$column_type,$not_null);
} }
$values[] = ($use_key===True ? $key.' IN ' : '') . '('.implode(',',$data).')'; $values[] = ($or_null?'(':'').(!count($data) ? '' : ($use_key===True ?
$this->name_quote($key).' IN ' : '') . '('.implode(',',$data).')').$or_null;
} }
elseif (is_int($key) && $use_key===True) elseif (is_int($key) && $use_key===True)
{ {
$values[] = $data; $values[] = $data;
} }
elseif ($use_key === True && !$not_null && is_null($data)) elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
{ {
$values[] = $this->name_quote($key) .' IS NULL'; $values[] = $this->name_quote($key) .' IS NULL';
} }