only register error handler once

2 files changed, 6 insertions, 8 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index 77e3fe19d..98c033124 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -19,6 +19,12 @@ use \OCA\News\Config\DependencyException;
 require_once __DIR__ . '/setup.php';
 
 if (is_setup()) {
+	// Turn all errors into exceptions to combat shitty library behavior
+	set_error_handler(function ($code, $message) {
+		if ($code === E_ERROR || $code === E_USER_ERROR) {
+			throw new \Exception($message, $code);
+		}
+	});
 
 	$container = new Application();
 
diff --git a/appinfo/application.php b/appinfo/application.php
index 4c99583e6..2dea28fc2 100644
--- a/appinfo/application.php
+++ b/appinfo/application.php
@@ -67,14 +67,6 @@ class Application extends App {
 	public function __construct(array $urlParams=array()){
 		parent::__construct('news', $urlParams);
 
-		// Turn all errors into exceptions to combat shitty library behavior
-		set_error_handler(function ($code, $message) {
-			if ($code === E_ERROR || $code === E_USER_ERROR) {
-				throw new \Exception($message, $code);
-			}
-		});
-
-
 		$container = $this->getContainer();