Author: ralfbecker
New Revision: 53187
URL: http://svn.stylite.de/viewvc/egroupware?rev=53187&view=rev
Log:
an other one: fix sql error if link-id (accidently) contains non-ascii chars
Modified:
trunk/phpgwapi/inc/class.solink.inc.php
Modified: trunk/phpgwapi/inc/class.solink.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/inc/class.solink.inc.php?rev=53187&r1=53186&r2=53187&view=diff
— trunk/phpgwapi/inc/class.solink.inc.php (original)
+++ trunk/phpgwapi/inc/class.solink.inc.php Thu Jul 23 13:49:41 2015
@@ -303,20 +303,27 @@
}
}
$deleted = array();
-
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__);
-
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__); -
} -
} -
// 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;
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs