aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-05 22:15:29 -0700
committerredmatrix <git@macgirvin.com>2016-04-05 22:15:29 -0700
commit0d50d295388c634a00f0c084e5c5ce78b098a78c (patch)
treee7c41f98409b6b8c58152334cda881de10d2cbfa /include
parent10f1e2d51b25c8c770419317a7d5ca78ce0ccd6a (diff)
parent54aa998b520f0f8932be3f5e358b926fadd1b77a (diff)
downloadvolse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.tar.gz
volse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.tar.bz2
volse-hubzilla-0d50d295388c634a00f0c084e5c5ce78b098a78c.zip
Merge branch 'master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/language.php2
1 files changed, 1 insertions, 1 deletions
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();