diff options
| author | Michael Hamann <michael@content-space.de> | 2012-09-08 13:22:44 +0200 |
|---|---|---|
| committer | Michael Hamann <michael@content-space.de> | 2012-09-08 14:34:57 +0200 |
| commit | eef93e99be0d44ec6dc4fa86373ba6fd2b8c5f48 (patch) | |
| tree | 6ca8bd332004ea8e4252587cc9ff5551347019d0 /inc/plugincontroller.class.php | |
| parent | de50cad65ae679a602e71adddffdd74df7ea3fbb (diff) | |
| download | rpg-eef93e99be0d44ec6dc4fa86373ba6fd2b8c5f48.tar.gz rpg-eef93e99be0d44ec6dc4fa86373ba6fd2b8c5f48.tar.bz2 | |
Use hardcoded plugin loading error message as $lang isn't initialized
When loading plugins, $lang might not be initialized yet, so use a
hardcoded error message instead, especially as this error should only be
displayed for the admin (and then fixed). This also removes the
previously localized message, it might be re-added as part of the new
extension manager.
Diffstat (limited to 'inc/plugincontroller.class.php')
| -rw-r--r-- | inc/plugincontroller.class.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/inc/plugincontroller.class.php b/inc/plugincontroller.class.php index 11636fb91..21f73f4cb 100644 --- a/inc/plugincontroller.class.php +++ b/inc/plugincontroller.class.php @@ -70,7 +70,6 @@ class Doku_Plugin_Controller { //we keep all loaded plugins available in global scope for reuse global $DOKU_PLUGINS; - global $lang; list($plugin,$component) = $this->_splitName($name); @@ -97,7 +96,7 @@ class Doku_Plugin_Controller { $dir = $this->get_directory($plugin); $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt"); if($inf['base'] && $inf['base'] != $plugin){ - msg(sprintf($lang['plugin_install_err'],hsc($plugin),hsc($inf['base'])),-1); + msg(sprintf("Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.", hsc($plugin), hsc($inf['base'])), -1); } return null; } |