extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:18:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed sql error when updating lists

Browse Source
This commit is contained in:
Ralf Becker 2012-02-20 11:21:45 +00:00
parent 9635091c75
commit d34c216f52
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
addressbook/inc/class.addressbook_sql.inc.php
View File

@ -548,7 +548,17 @@ class addressbook_sql extends so_sql_cf
} }
if (isset($keys['list_carddav_name'])) if (isset($keys['list_carddav_name']))
{ {
$keys = false; // cant PUT a name in 11.1 if (isset($data['list_id'])) // use id if given
{
$keys = array(
'list_id' => $data['list_id'],
);
unset($data['list_id']);
}
else
{
$keys = false; // cant PUT a name in 11.1
}
} }
if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn())) if (!$keys || !($list_id = $this->db->select($this->lists_table,'list_id',$keys,__LINE__,__FILE__)->fetchColumn()))
{ {
@ -673,8 +683,13 @@ class addressbook_sql extends so_sql_cf
{ {
$modified = 0; $modified = 0;
} }
//error_log(__METHOD__.'('.array2string($owner).') returning '.array2string($modified)); if (!($created = $this->db->select($this->lists_table,'MAX(list_created)',array('list_owner'=>$owner),
return $modified; __LINE__,__FILE__)->fetchColumn()))
{
$created = 0;
}
//error_log(__METHOD__.'('.array2string($owner).") MAX(list_added)=$modified, MAX(list_created)=$created returning ".array2string(max($modified,$created)));
return max($modified,$created);
} }
/** /**