From cbbceed30fb31731e48c4afa80fdede4cf79a961 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sat, 29 Oct 2005 14:16:38 +0000
Subject: [PATCH] fix broken locale update

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4934 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/IniConfig.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/IniConfig.php b/lib/IniConfig.php
index 50906ae59..8f57286ca 100644
--- a/lib/IniConfig.php
+++ b/lib/IniConfig.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: IniConfig.php,v 1.96 2005-09-26 06:27:33 rurban Exp $');
+rcs_id('$Id: IniConfig.php,v 1.97 2005-10-29 14:16:38 rurban Exp $');
 
 /**
  * A configurator intended to read its config from a PHP-style INI file,
@@ -666,14 +666,14 @@ function fixup_dynamic_configs($file) {
     if (!defined('DEFAULT_LANGUAGE'))   // not needed anymore
         define('DEFAULT_LANGUAGE', ''); // detect from client
 
-    //update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
+    update_locale(isset($LANG) ? $LANG : DEFAULT_LANGUAGE);
     if (empty($LANG)) {
         if (!defined("DEFAULT_LANGUAGE") or !DEFAULT_LANGUAGE) {
             // TODO: defer this to WikiRequest::initializeLang()
             $LANG = guessing_lang(); 
             guessing_setlocale (LC_ALL,$LANG);
-            }
-      else    
+        }
+        else
             $LANG = DEFAULT_LANGUAGE;
     }
  
@@ -852,6 +852,9 @@ function fixup_dynamic_configs($file) {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.96  2005/09/26 06:27:33  rurban
+// default locale fix Thomas Harding
+//
 // Revision 1.95  2005/09/18 15:15:53  rurban
 // add a proper Content-Encoding: gzip if compressed, and omit Content-Length then.
 //
-- 
2.45.0