Bug 350 - Fixed user language settings ignored bug.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2017 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
ecacce3256
commit
2d77044be5
|
@ -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 )
|
||||
{
|
||||
|
|
|
@ -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 ),
|
||||
);
|
||||
|
||||
|
||||
?>
|
||||
|
|
|
@ -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" );
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue