diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-02-01 20:04:33 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-02-01 20:04:33 +0100 |
| commit | 3dd136f26e36d0f453649e77300b408cfa8491e4 (patch) | |
| tree | f03a7dba5d86473df5c4c457a88c73234cc49705 /program/lib/Roundcube/rcube.php | |
| parent | 1f910cb50dcb12e84d92db4d61dcd8dbb0f0c5b6 (diff) | |
| parent | 01a98cb9d65abf8f31b7bc62002a5061e463c80f (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/Roundcube/rcube.php')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index a914ae65a..3ae511e1e 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1073,14 +1073,17 @@ class rcube { // handle PHP exceptions if (is_object($arg) && is_a($arg, 'Exception')) { - $err = array( + $arg = array( 'type' => 'php', 'code' => $arg->getCode(), 'line' => $arg->getLine(), 'file' => $arg->getFile(), 'message' => $arg->getMessage(), ); - $arg = $err; + } + + if (empty($arg['code'])) { + $arg['code'] = 500; } // installer |