summaryrefslogtreecommitdiff
path: root/lib/plugins/admin.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/plugins/admin.php')
-rw-r--r--lib/plugins/admin.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/plugins/admin.php b/lib/plugins/admin.php
index a5a8bd940..16e2ed72e 100644
--- a/lib/plugins/admin.php
+++ b/lib/plugins/admin.php
@@ -15,7 +15,7 @@ if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
class DokuWiki_Admin_Plugin {
var $localised = false; // set to true by setupLocale() after loading language dependent strings
- var $lang = array(); // array to hold language dependent strings, best accessed via ->getLang()
+ var $lang = array(); // array to hold language dependent strings, best accessed via ->getLang()
/**
* General Info
@@ -114,11 +114,13 @@ class DokuWiki_Admin_Plugin {
* this function is automatically called by getLang()
*/
function setupLocale() {
- if ($this->localised) return;
-
+ if ($this->localised) return;
+
global $conf; // definitely don't invoke "global $lang"
$path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
-
+
+ $lang = array();
+
// don't include once, in case several plugin components require the same language file
@include($path.'en/lang.php');
if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');