From 73819c4f0542bf3e4e270725ce091acf5702b52f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 30 Sep 2015 17:29:54 +0200
Subject: Fix l10n on master

* $app isn't useful for this case
* kill it with :fire:
---
 lib/private/l10n.php | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'lib')

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 168011cfcec..79c44f7f3bd 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -102,16 +102,11 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @param $app
 	 * @return string
 	 */
-	public static function setLanguageFromRequest($app = null) {
+	public static function setLanguageFromRequest() {
 		if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-			if (is_array($app)) {
-				$available = $app;
-			} else {
-				$available = self::findAvailableLanguages($app);
-			}
+			$available = self::findAvailableLanguages();
 
 			// E.g. make sure that 'de' is before 'de_DE'.
 			sort($available);
@@ -122,17 +117,13 @@ 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_array($app)) {
-							self::$language = $available_language;
-						}
+						self::$language = $available_language;
 						return $available_language;
 					}
 				}
 				foreach ($available as $available_language) {
 					if (substr($preferred_language, 0, 2) === $available_language) {
-						if (!is_array($app)) {
-							self::$language = $available_language;
-						}
+						self::$language = $available_language;
 						return $available_language;
 					}
 				}
@@ -469,7 +460,7 @@ class OC_L10N implements \OCP\IL10N {
 			return $default_language;
 		}
 
-		$lang = self::setLanguageFromRequest($app);
+		$lang = self::setLanguageFromRequest();
 		if($userId && !$config->getUserValue($userId, 'core', 'lang')) {
 			$config->setUserValue($userId, 'core', 'lang', $lang);
 		}
-- 
cgit v1.2.3