CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.tokyo.tequila.jp:/var/lib/git/php_core

Browse Source
This commit is contained in:
Clemens Schwaighofer
2017-11-28 13:33:53 +09:00
parent 63a2495183 717962edc5
commit 42b4112a5e
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/libs/Class.Basic.inc
View File

@@ -313,7 +313,7 @@
if (!session_id()) if (!session_id())
{ {
// check if we have an external session name given, else skip this step // 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 // set the session name for possible later check
$this->session_name = SET_SESSION_NAME; $this->session_name = SET_SESSION_NAME;

10
www/libs/Class.l10n.inc
View File

@@ -105,5 +105,15 @@
{ {
return $this->l10n->ngettext($single, $plural, $number); return $this->l10n->ngettext($single, $plural, $number);
} }
public function __get_lang()
{
return $this->lang;
}
public function __get_mofile()
{
return $this->mofile;
}
} }
?> ?>