From c90b2fb183974c22359b17366599543007f0eea3 Mon Sep 17 00:00:00 2001 From: chris Date: Fri, 5 Aug 2005 01:50:36 +0200 Subject: minor plugin fixes to protect against invalid/malformed plugins darcs-hash:20050804235036-50fdc-1881a40da689bc5abbe608a2ce96a1ed192a43a4.gz --- inc/pluginutils.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'inc/pluginutils.php') diff --git a/inc/pluginutils.php b/inc/pluginutils.php index 89d0c9f44..964635b2c 100644 --- a/inc/pluginutils.php +++ b/inc/pluginutils.php @@ -81,21 +81,17 @@ function &plugin_load($type,$name){ } //try to load the wanted plugin file - if(!include_once(DOKU_PLUGIN."$name/$type.php")){ + if(!@include_once(DOKU_PLUGIN."$name/$type.php")){ list($plugin, $component) = preg_split("/_/",$name, 2); - if (!$component || !include_once(DOKU_PLUGIN."$plugin/$type/$component.php")) { + if (!$component || !@include_once(DOKU_PLUGIN."$plugin/$type/$component.php")) { return null; } } -/* FIXME: chris: what's this for? - global $plugin_investigate_pluginorder; - if (!isset($plugin_investigate_pluginorder)) $plugin_investigate_pluginorder = array(); - $plugin_investigate_pluginorder[] = $name; -*/ - //construct class and instanciate $class = $type.'_plugin_'.$name; + if (!class_exists($class)) return null; + $DOKU_PLUGINS[$type][$name] = new $class; return $DOKU_PLUGINS[$type][$name]; } -- cgit v1.2.3