banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pluginhost: catch fatal errors in plugin init

Browse Source
master
Andrew Dolgov 4 years ago
parent 9de26d44da
commit 4165834f80
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File

40
classes/pluginhost.php
Unescape Escape View File

@ -249,23 +249,29 @@ class PluginHost {
$this->last_registered = $class; $this->last_registered = $class;
switch ($kind) { try {
case $this::KIND_SYSTEM: switch ($kind) {
if ($this->is_system($plugin)) { case $this::KIND_SYSTEM:
if (!$skip_init) $plugin->init($this); if ($this->is_system($plugin)) {
$this->register_plugin($class, $plugin); if (!$skip_init) $plugin->init($this);
} $this->register_plugin($class, $plugin);
break; }
case $this::KIND_USER: break;
if (!$this->is_system($plugin)) { case $this::KIND_USER:
if (!$skip_init) $plugin->init($this); if (!$this->is_system($plugin)) {
$this->register_plugin($class, $plugin); if (!$skip_init) $plugin->init($this);
} $this->register_plugin($class, $plugin);
break; }
case $this::KIND_ALL: break;
if (!$skip_init) $plugin->init($this); case $this::KIND_ALL:
$this->register_plugin($class, $plugin); if (!$skip_init) $plugin->init($this);
break; $this->register_plugin($class, $plugin);
break;
}
} catch (Exception $ex) {
user_error($ex, E_USER_WARNING);
} catch (Error $err) {
user_error($err, E_USER_WARNING);
} }
} }
} }

Write Preview
Loading…
Cancel
Save