From 16521111dd62031afbcbdadffe0f8f6929fb6056 Mon Sep 17 00:00:00 2001
From: andi <andi@splitbrain.org>
Date: Mon, 23 May 2005 19:48:04 +0200
Subject: moved loading of languages to init.php - fixes #346

darcs-hash:20050523174804-9977f-a49e154bb89357d39eb8ddb3273650759cd74114.gz
---
 ajax.php     | 2 --
 doku.php     | 2 --
 inc/init.php | 4 ++++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ajax.php b/ajax.php
index 26bccc4d0..928a6d286 100644
--- a/ajax.php
+++ b/ajax.php
@@ -10,8 +10,6 @@ if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__)).'/');
 require_once(DOKU_INC.'inc/init.php');
 require_once(DOKU_INC.'inc/common.php');
 require_once(DOKU_INC.'inc/pageutils.php');
-require_once(DOKU_INC.'lang/en/lang.php');
-require_once(DOKU_INC.'lang/'.$conf['lang'].'/lang.php');
 require_once(DOKU_INC.'inc/auth.php');
 
 
diff --git a/doku.php b/doku.php
index 43b036d86..1b169c57b 100644
--- a/doku.php
+++ b/doku.php
@@ -13,8 +13,6 @@
   require_once(DOKU_INC.'inc/common.php');
   require_once(DOKU_INC.'inc/pageutils.php');
   require_once(DOKU_INC.'inc/html.php');
-  require_once(DOKU_INC.'lang/en/lang.php');
-  require_once(DOKU_INC.'lang/'.$conf['lang'].'/lang.php');
   require_once(DOKU_INC.'inc/auth.php');
   require_once(DOKU_INC.'inc/actions.php');
 
diff --git a/inc/init.php b/inc/init.php
index af1d1eb9c..363518b65 100644
--- a/inc/init.php
+++ b/inc/init.php
@@ -21,6 +21,10 @@
   global $lang;
   $lang = array();
 
+  //load the language files
+  require_once(DOKU_INC.'lang/en/lang.php');
+  require_once(DOKU_INC.'lang/'.$conf['lang'].'/lang.php');
+
   // define baseURL
   if(!defined('DOKU_BASE')) define('DOKU_BASE',getBaseURL());
   if(!defined('DOKU_URL'))  define('DOKU_URL',getBaseURL(true));
-- 
cgit v1.2.3