holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow sql fragments in Api\Storage\Base::delete as in other places

Browse Source
This commit is contained in:
Ralf Becker 2017-11-06 16:24:30 +01:00
parent 0d99d129dc
commit 790fa8c71d
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/src/Storage/Base.php
View File

@ -776,7 +776,11 @@ class Base
$data = $keys; $keys = array(); $data = $keys; $keys = array();
foreach($this->db_cols as $db_col => $col) foreach($this->db_cols as $db_col => $col)
{ {
if (isset($data[$col])) if (is_int($db_col))
{
$keys[] = $col;
}
elseif (isset($data[$col]))
{ {
$keys[$db_col] = $col; $keys[$db_col] = $col;
} }
@ -785,9 +789,16 @@ class Base
$data = $this->data2db($data); $data = $this->data2db($data);
foreach($keys as $db_col => $col) foreach($keys as $db_col => $col)
{
if (is_int($db_col))
{
$query[] = $col;
}
else
{ {
$query[$db_col] = $data[$col]; $query[$db_col] = $data[$col];
} }
}
if ($only_return_query) return $query; if ($only_return_query) return $query;
$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app); $this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);