mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-26 01:43:47 +01:00
"fixed not working install (segfault) caused by account creation in sitemgr's default_records and the new uid code in addressbook_sql::save() going into an invinit recureing, because so_sql::update calls $this->save() instead of self::save()"
This commit is contained in:
parent
40c143c843
commit
b89e7b46a1
@ -563,7 +563,7 @@ class so_sql
|
||||
}
|
||||
$this->init($fields);
|
||||
|
||||
$ret = $this->save();
|
||||
$ret = self::save();
|
||||
|
||||
if ($merge)
|
||||
{
|
||||
@ -665,7 +665,7 @@ class so_sql
|
||||
if ($criteria[$col][0] == '!')
|
||||
{
|
||||
$cmp_op = ' NOT'.$cmp_op;
|
||||
$criteria[$col] = substr($criteria[$col],1);
|
||||
$criteria[$col] = '('.substr($criteria[$col],1).' OR '.$criteria[$col].' IS NULL)';
|
||||
$negate = true;
|
||||
}
|
||||
$query[] = ($negate ? ' ('.$db_col.' IS NULL OR ' : '').$db_col.$cmp_op.$this->db->quote($wildcard.str_replace(array('%','_','*','?'),array('\\%','\\_','%','_'),$criteria[$col]).$wildcard).($negate ? ') ' : '');
|
||||
|
Loading…
Reference in New Issue
Block a user