diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-01-01 12:31:14 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-01-01 12:31:14 +0100 |
| commit | 0301d9347f8c59882cdd7b6ed59686b286a77876 (patch) | |
| tree | c0da8e84a741f49251974a6a78aa8faf4851d77f /program/lib/Roundcube/rcube.php | |
| parent | d575e46067c06f1165adb249865f3812e270df12 (diff) | |
CS fixes
Diffstat (limited to 'program/lib/Roundcube/rcube.php')
| -rw-r--r-- | program/lib/Roundcube/rcube.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/program/lib/Roundcube/rcube.php b/program/lib/Roundcube/rcube.php index 331b57e96..503e29d6f 100644 --- a/program/lib/Roundcube/rcube.php +++ b/program/lib/Roundcube/rcube.php @@ -1152,7 +1152,6 @@ class rcube // handle PHP exceptions if (is_object($arg) && is_a($arg, 'Exception')) { $arg = array( - 'type' => 'php', 'code' => $arg->getCode(), 'line' => $arg->getLine(), 'file' => $arg->getFile(), @@ -1160,7 +1159,7 @@ class rcube ); } else if (is_string($arg)) { - $arg = array('message' => $arg, 'type' => 'php'); + $arg = array('message' => $arg); } if (empty($arg['code'])) { @@ -1176,7 +1175,7 @@ class rcube $cli = php_sapi_name() == 'cli'; - if (($log || $terminate) && !$cli && $arg['type'] && $arg['message']) { + if (($log || $terminate) && !$cli && $arg['message']) { $arg['fatal'] = $terminate; self::log_bug($arg); } @@ -1204,7 +1203,7 @@ class rcube */ public static function log_bug($arg_arr) { - $program = strtoupper($arg_arr['type']); + $program = strtoupper(!empty($arg_arr['type']) ? $arg_arr['type'] : 'php'); $level = self::get_instance()->config->get('debug_level'); // disable errors for ajax requests, write to log instead (#1487831) |