From 147cce7acd3ce673c494dc9b30f36b3d5554abea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Sun, 16 Oct 2011 06:09:25 +0200 Subject: bug 985: replace occurences of $_SESSION['_config']['translations'] MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this includes a little rewrite of reminder handling Signed-off-by: Michael Tänzer --- includes/account.php | 3 ++- includes/general_stuff.php | 4 +++- pages/account/41.php | 11 +++++++---- pages/wot/5.php | 3 ++- pages/wot/9.php | 9 ++++++--- www/wot.php | 47 ++++++++++++++++++++++------------------------ 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/includes/account.php b/includes/account.php index 24c61d8..ebae1f6 100644 --- a/includes/account.php +++ b/includes/account.php @@ -16,6 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ require_once("../includes/loggedin.php"); + require_once("../includes/lib/l10n.php"); loadem("account"); @@ -2345,7 +2346,7 @@ { csrf_check("mainlang"); $lang = mysql_real_escape_string($_REQUEST['lang']); - foreach($_SESSION['_config']['translations'] as $key => $val) + foreach(L10n::$translations as $key => $val) { if($key == $lang) { diff --git a/includes/general_stuff.php b/includes/general_stuff.php index 088c39e..b4795e0 100644 --- a/includes/general_stuff.php +++ b/includes/general_stuff.php @@ -16,6 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +require_once($_SESSION['_config']['filepath'].'/includes/lib/l10n.php'); + if(!function_exists("showheader")) { function showbodycontent($title = "CAcert.org", $title2 = "") @@ -60,7 +62,7 @@ google_color_border = "FFFFFF";