From 89d74a2fd7d0dc4b48e7df429bea2ddb84a5dba6 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 28 Jan 2006 02:16:05 +0100 Subject: config plugin update, fix php5 warnings + other improvements darcs-hash:20060128011605-9b6ab-38b917f8e1b311ff319d1cfd356369e428e95c3e.gz --- lib/plugins/admin.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/plugins/admin.php') 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'); -- cgit v1.2.3