pluginhost: catch fatal errors in plugin init

3 years ago · 4165834f80
parent 9de26d44da
commit 4165834f80
1 changed files with 23 additions and 17 deletions
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@ -249,6 +249,7 @@ class PluginHost {

 					$this->last_registered = $class;

+					try {
 						switch ($kind) {
 							case $this::KIND_SYSTEM:
 								if ($this->is_system($plugin)) {
@ -267,6 +268,11 @@ class PluginHost {
 								$this->register_plugin($class, $plugin);
 								break;
 							}
+					} catch (Exception $ex) {
+						user_error($ex, E_USER_WARNING);
+					} catch (Error $err) {
+						user_error($err, E_USER_WARNING);
+					}
 				}
 			}
 		}