Merge branch 'master' into doctrine

Conflicts:
	lib/base.php
	lib/db.php

1 files changed, 25 insertions, 0 deletions

diff --git a/lib/log.php b/lib/log.php
index 6de99b4ea6b..e9cededa5c0 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -39,4 +39,29 @@ class OC_Log {
 			$log_class::write($app, $message, $level);
 		}
 	}
+	
+	//Fatal errors handler
+	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;
+		}
+	}
+	
+	// Uncaught exception handler
+	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) {
+		if (error_reporting() === 0) {
+			return;
+		}
+		self::write('PHP', $message . ' at ' . $file . '#' . $line, self::WARN);
+
+	}
 }