diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-05 22:15:29 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-05 22:15:29 -0700 |
| commit | 0d50d295388c634a00f0c084e5c5ce78b098a78c (patch) | |
| tree | e7c41f98409b6b8c58152334cda881de10d2cbfa | |
| parent | 10f1e2d51b25c8c770419317a7d5ca78ce0ccd6a (diff) | |
| parent | 54aa998b520f0f8932be3f5e358b926fadd1b77a (diff) | |
| download | volse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.tar.gz volse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.tar.bz2 volse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.zip | |
Merge branch 'master' into dev
| -rwxr-xr-x | boot.php | 1 | ||||
| -rw-r--r-- | include/language.php | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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; diff --git a/include/language.php b/include/language.php index 1a012cb84..d6b7606ca 100644 --- a/include/language.php +++ b/include/language.php @@ -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(); |