diff options
| -rw-r--r-- | inc/pluginutils.php | 2 | ||||
| -rw-r--r-- | lib/plugins/syntax.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/inc/pluginutils.php b/inc/pluginutils.php index 0adba09f3..183e22229 100644 --- a/inc/pluginutils.php +++ b/inc/pluginutils.php @@ -82,7 +82,7 @@ function &plugin_load($type,$name){ } } - //construct class and instanciate + //construct class and instantiate $class = $type.'_plugin_'.$name; if (!class_exists($class)) return null; diff --git a/lib/plugins/syntax.php b/lib/plugins/syntax.php index 2a4d1e0ff..ccf657720 100644 --- a/lib/plugins/syntax.php +++ b/lib/plugins/syntax.php @@ -133,8 +133,11 @@ class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode { foreach($allowedModeTypes as $mt) { $this->allowedModes = array_merge($this->allowedModes, $PARSER_MODES[$mt]); } - - unset($this->allowedModes[array_search(substr(get_class($this), 7), $this->allowedModes)]); + + $idx = array_search(substr(get_class($this), 7), $this->allowedModes); + if ($idx !== false) { + unset($this->allowedModes[$idx]); + } $this->allowedModesSetup = true; } |