From 712e478cb2b430354ef173a48158472d0a004dd3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Apr 2015 15:36:24 +0200
Subject: [PATCH] fix caching of preferred language

---
 lib/private/l10n.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 95b80bebdb..59f26423af 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -125,7 +125,7 @@ class OC_L10N implements \OCP\IL10N {
 				$preferred_language = str_replace('-', '_', $preferred_language);
 				foreach ($available as $available_language) {
 					if ($preferred_language === strtolower($available_language)) {
-						if (is_null($app)) {
+						if (!is_array($app)) {
 							self::$language = $available_language;
 						}
 						return $available_language;
@@ -133,7 +133,7 @@ class OC_L10N implements \OCP\IL10N {
 				}
 				foreach ($available as $available_language) {
 					if (substr($preferred_language, 0, 2) === $available_language) {
-						if (is_null($app)) {
+						if (!is_array($app)) {
 							self::$language = $available_language;
 						}
 						return $available_language;
@@ -142,6 +142,7 @@ class OC_L10N implements \OCP\IL10N {
 			}
 		}
 
+		self::$language = 'en';
 		// Last try: English
 		return 'en';
 	}