diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-14 15:15:05 +0000 |
| commit | 5fe61296981343a3f877618aeecfc33ea7fed3c1 (patch) | |
| tree | 919ea533c8d98f71f7c77d534eb0595207d22a17 /lib/log.php | |
| parent | 4facd766e3712d4c714f2e1bf2ad4be41461a7cc (diff) | |
| parent | f0893fb8fe7f0642ae30de2e1168472377c127e2 (diff) | |
| download | nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.tar.gz nextcloud-server-5fe61296981343a3f877618aeecfc33ea7fed3c1.zip | |
Merge master into ocs_api, fix conflicts.
Diffstat (limited to 'lib/log.php')
| -rw-r--r-- | lib/log.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/log.php b/lib/log.php index 4bba62cf4b2..e9cededa5c0 100644 --- a/lib/log.php +++ b/lib/log.php @@ -41,23 +41,26 @@ class OC_Log { } //Fatal errors handler - public static function onShutdown(){ + public static function onShutdown() { $error = error_get_last(); if($error) { //ob_end_clean(); self::write('PHP', $error['message'] . ' at ' . $error['file'] . '#' . $error['line'], self::FATAL); } else { - return true; + return true; } } // Uncaught exception handler - public static function onException($exception){ + public static function onException($exception) { self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL); } //Recoverable errors handler - public static function onError($number, $message, $file, $line){ + public static function onError($number, $message, $file, $line) { + if (error_reporting() === 0) { + return; + } self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN); } |