harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
redmatrix 2016-04-05 22:15:29 -07:00
commit 0d50d29538
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

@ -711,6 +711,7 @@ class App {
public static $module;
public static $pager;
public static $strings;
public static $stringsave; // used in push_lang() and pop_lang()
public static $hooks;
public static $timezone;
public static $interactive = true;

2
include/language.php
View File

@ -109,7 +109,7 @@ function pop_lang() {
if(App::$language === App::$langsave)
return;
if(isset(App::$stringsave))
if(isset(App::$stringsave) && is_array(App::$stringsave))
App::$strings = App::$stringsave;
else
App::$strings = array();