lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: Use correct formating function.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-06-15 06:38:34 +00:00
parent 845e0b3432
commit 45823ab7a6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/tpl/login.tpl.php
View File

@ -78,7 +78,7 @@ jQuery(document).ready(function () {
dst = "0"; // daylight savings time is NOT observed dst = "0"; // daylight savings time is NOT observed
} else { } else {
dst = "1"; // daylight savings time is observed dst = "1"; // daylight savings time is observed
} }
jQuery('#tz').val(std_time_offset); // returns TZ jQuery('#tz').val(std_time_offset); // returns TZ
jQuery('#dst').val(dst); // returns DST jQuery('#dst').val(dst); // returns DST
// Detect and save screen resolution // Detect and save screen resolution

2
htdocs/lib/security.lib.php
View File

@ -254,7 +254,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
$i++; $i++;
} }
} }
$main_home=nl2br($conf->global->MAIN_HOME); $main_home=dol_htmlcleanlastbr($conf->global->MAIN_HOME);
// Google AD // Google AD
$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0); $main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);