diff options
| -rw-r--r-- | inc/load.php | 9 | ||||
| -rw-r--r-- | inc/plugincontroller.class.php | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/inc/load.php b/inc/load.php index 9f54034a3..7a410e452 100644 --- a/inc/load.php +++ b/inc/load.php @@ -96,11 +96,12 @@ function load_autoload($name){ // Plugin loading if(preg_match('/^(helper|syntax|action|admin|renderer|remote)_plugin_([^_]+)(?:_([^_]+))?$/', $name, $m)) { - //try to load the wanted plugin file - // include, but be silent. Maybe some other autoloader has an idea - // how to load this class. + // try to load the wanted plugin file $c = ((count($m) === 4) ? "/{$m[3]}" : ''); - @include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php"; + $plg = DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php"; + if(@file_exists($plg)){ + include DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php"; + } return; } } diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index 208d7dae9..11636fb91 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -169,7 +169,7 @@ class Doku_Plugin_Controller { $plugins = array(); foreach($files as $file) { if(file_exists($file)) { - @include_once($file); + include_once($file); } } return $plugins; |