extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing (global) namespace in Exception from last commit, also fixed existing cases

Browse Source
This commit is contained in:
Ralf Becker 2016-06-06 11:03:22 +02:00
parent 95f092a2c5
commit 3ccea2b6d7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Storage/Merge.php
View File

@ -232,7 +232,7 @@ abstract class Merge
try { try {
$value = Api\DateTime::to($value, true); $value = Api\DateTime::to($value, true);
} }
catch (Exception $e) { catch (\Exception $e) {
unset($e); // ignore exception caused by wrongly formatted date unset($e); // ignore exception caused by wrongly formatted date
} }
} }
@ -1280,7 +1280,7 @@ abstract class Merge
Api\DateTime::$user_timezone Api\DateTime::$user_timezone
); );
if($date) break; if($date) break;
} catch (Exception $e) { } catch (\Exception $e) {
} }
} }
@ -1630,7 +1630,7 @@ abstract class Merge
{ {
$this->apply_styles($merged, $mimetype); $this->apply_styles($merged, $mimetype);
} }
catch (Exception $e) catch (\Exception $e)
{ {
// Error converting HTML styles over // Error converting HTML styles over
error_log($e->getMessage()); error_log($e->getMessage());