From 717962edc5a51469a82da2969d4c2da80391e98c Mon Sep 17 00:00:00 2001 From: Clemens Schwaighofer Date: Tue, 28 Nov 2017 12:01:15 +0900 Subject: [PATCH] Bug fix for session name set in basic class, add info methods for l10n The session name was never set correctly because it was not checked for the define var, but for a normal variable in the basic session name settings flow The l10n class has two new return methods for lang and mofile to check if the correct ones are set --- www/libs/Class.Basic.inc | 2 +- www/libs/Class.l10n.inc | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/www/libs/Class.Basic.inc b/www/libs/Class.Basic.inc index e5d431d1..e8796e2e 100644 --- a/www/libs/Class.Basic.inc +++ b/www/libs/Class.Basic.inc @@ -313,7 +313,7 @@ if (!session_id()) { // check if we have an external session name given, else skip this step - if (isset($GLOBALS['SET_SESSION_NAME'])) + if (SET_SESSION_NAME) { // set the session name for possible later check $this->session_name = SET_SESSION_NAME; diff --git a/www/libs/Class.l10n.inc b/www/libs/Class.l10n.inc index f282c13e..40ca3e51 100644 --- a/www/libs/Class.l10n.inc +++ b/www/libs/Class.l10n.inc @@ -105,5 +105,15 @@ { return $this->l10n->ngettext($single, $plural, $number); } + + public function __get_lang() + { + return $this->lang; + } + + public function __get_mofile() + { + return $this->mofile; + } } ?>