From 2d77044be57947492e1b1202fb8d2d92521a7ff0 Mon Sep 17 00:00:00 2001
From: stan <stan@e3e1d417-86f3-4887-817a-d78f3d33393f>
Date: Wed, 18 Oct 2006 15:26:40 +0000
Subject: [PATCH] Bug 350 - Fixed user language settings ignored bug.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2017 e3e1d417-86f3-4887-817a-d78f3d33393f
---
 web/zm_html.php         | 4 +++-
 web/zm_html_config.php  | 4 ----
 web/zm_xhtml.php        | 4 +++-
 web/zm_xhtml_config.php | 3 ---
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/web/zm_html.php b/web/zm_html.php
index 9a5c9fad9..0e2b5e55e 100644
--- a/web/zm_html.php
+++ b/web/zm_html.php
@@ -25,7 +25,7 @@ if ( !$bandwidth )
 
 //ini_set( "magic_quotes_gpc", "Off" );
 
-require_once( 'zm_html_config.php' );
+require_once( 'zm_config.php' );
 
 if ( ZM_OPT_USE_AUTH )
 {
@@ -44,7 +44,9 @@ else
 	$user = $default_user;
 }
 
+require_once( 'zm_lang.php' );
 require_once( 'zm_funcs.php' );
+require_once( 'zm_html_config.php' );
 
 if ( !isset($user) && ZM_OPT_USE_AUTH )
 {
diff --git a/web/zm_html_config.php b/web/zm_html_config.php
index fe40d4608..bc287ebaa 100644
--- a/web/zm_html_config.php
+++ b/web/zm_html_config.php
@@ -18,9 +18,6 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-require_once( 'zm_config.php' );
-require_once( 'zm_lang.php' );
-
 $rates = array(
 	"10000" => "100x",
 	"5000" => "50x",
@@ -149,5 +146,4 @@ $jws = array(
 	'zones' => array( 'w'=>72, 'h'=>232 ),
 );
 
-
 ?>
diff --git a/web/zm_xhtml.php b/web/zm_xhtml.php
index 434c7264e..f7a65bca9 100644
--- a/web/zm_xhtml.php
+++ b/web/zm_xhtml.php
@@ -22,7 +22,7 @@ $bandwidth = "phone";
 
 //ini_set( "magic_quotes_gpc", "Off" );
 
-require_once( 'zm_xhtml_config.php' );
+require_once( 'zm_config.php' );
 
 if ( ZM_OPT_USE_AUTH )
 {
@@ -41,7 +41,9 @@ else
 	$user = $default_user;
 }
 
+require_once( 'zm_lang.php' );
 require_once( 'zm_funcs.php' );
+require_once( 'zm_xhtml_config.php' );
 
 noCacheHeaders();
 header("Content-type: application/xhtml+xml" );
diff --git a/web/zm_xhtml_config.php b/web/zm_xhtml_config.php
index c2efc192f..80caface3 100644
--- a/web/zm_xhtml_config.php
+++ b/web/zm_xhtml_config.php
@@ -18,9 +18,6 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-require_once( 'zm_config.php' );
-require_once( 'zm_lang.php' );
-
 define( 'DEVICE_WIDTH', 150 );							// Default device width for phones and handhelds
 define( 'DEVICE_HEIGHT', 150 );							// Default device height for phones and handhelds
 define( 'DEVICE_LINES', 10 );							// Default device lines for phones and handhelds