mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
an other one: fix sql error if link-id (accidently) contains non-ascii chars
This commit is contained in:
parent
d59c15582f
commit
0f72e3d58d
@ -303,20 +303,27 @@ class solink
|
||||
}
|
||||
}
|
||||
$deleted = array();
|
||||
foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
|
||||
{
|
||||
$deleted[] = $row;
|
||||
try {
|
||||
foreach(self::$db->select(self::TABLE,'*',$where,__LINE__,__FILE__) as $row)
|
||||
{
|
||||
$deleted[] = $row;
|
||||
}
|
||||
if($hold_for_purge)
|
||||
{
|
||||
self::$db->update(self::TABLE,array(
|
||||
'deleted' => time(),
|
||||
'link_lastmod' => time(),
|
||||
), $where, __LINE__,__FILE__);
|
||||
}
|
||||
else
|
||||
{
|
||||
self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
|
||||
}
|
||||
}
|
||||
if($hold_for_purge)
|
||||
{
|
||||
self::$db->update(self::TABLE,array(
|
||||
'deleted' => time(),
|
||||
'link_lastmod' => time(),
|
||||
), $where, __LINE__,__FILE__);
|
||||
}
|
||||
else
|
||||
{
|
||||
self::$db->delete(self::TABLE,$where,__LINE__,__FILE__);
|
||||
// catch Illegal mix of collations (ascii_general_ci,IMPLICIT) and (utf8_general_ci,COERCIBLE) for operation '=' (1267)
|
||||
// caused by non-ascii chars compared with ascii field uid
|
||||
catch(egw_exception_db $e) {
|
||||
_egw_log_exception($e);
|
||||
}
|
||||
|
||||
return $deleted;
|
||||
|
Loading…
Reference in New Issue
Block a user