From 45823ab7a6ef46f25cac4f90b928d20e14d27714 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 15 Jun 2011 06:38:34 +0000
Subject: [PATCH] Fix: Use correct formating function.
---
htdocs/core/tpl/login.tpl.php | 2 +-
htdocs/lib/security.lib.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 6e8cb9159de..eb7ae306a1b 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -78,7 +78,7 @@ jQuery(document).ready(function () {
dst = "0"; // daylight savings time is NOT observed
} else {
dst = "1"; // daylight savings time is observed
- }
+ }
jQuery('#tz').val(std_time_offset); // returns TZ
jQuery('#dst').val(dst); // returns DST
// Detect and save screen resolution
diff --git a/htdocs/lib/security.lib.php b/htdocs/lib/security.lib.php
index f15a87e9711..8717d25c2ed 100644
--- a/htdocs/lib/security.lib.php
+++ b/htdocs/lib/security.lib.php
@@ -254,7 +254,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
$i++;
}
}
- $main_home=nl2br($conf->global->MAIN_HOME);
+ $main_home=dol_htmlcleanlastbr($conf->global->MAIN_HOME);
// Google AD
$main_google_ad_client = ((! empty($conf->global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT))?1:0);
--
GitLab