Merge branch 'master' into dev

2016-04-05 22:15:29 -07:00
parent 10f1e2d51b 54aa998b52
commit 0d50d29538
2 changed files with 2 additions and 1 deletions
--- 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();