extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-07 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow functions deep in the stack (table callbacks) to throw exceptions in error conditions

Browse Source
This commit is contained in:
Nathan Gray 2011-06-21 21:14:16 +00:00
parent a555588dbe
commit 0ecbc8b54d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etemplate/inc/class.bo_merge.inc.php
View File

@ -306,7 +306,12 @@ abstract class bo_merge
{
$mimetype = 'application/rtf';
}
return $this->merge_string($content,$ids,$err,$mimetype,$fix);
try {
return $this->merge_string($content,$ids,$err,$mimetype,$fix);
} catch (Exception $e) {
$err = $e->getMessage();
return false;
}
}
/**