From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 17 Dec 2015 14:01:21 +0000 (+0100)
Subject: initialize l10n instance earlier, fixes an undefined var warning followed by a php... 
X-Git-Tag: v9.0beta1~469^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0ecbfae5ff924dba061a94e46e96e5e1c252794e;p=nextcloud-server.git

initialize l10n instance earlier, fixes an undefined var warning followed by a php error
---

diff --git a/settings/changepassword/controller.php b/settings/changepassword/controller.php
index 695914683db..f5b9bd58b59 100644
--- a/settings/changepassword/controller.php
+++ b/settings/changepassword/controller.php
@@ -55,10 +55,10 @@ class Controller {
 		\OC_JSON::callCheck();
 		\OC_JSON::checkLoggedIn();
 
+		$l = new \OC_L10n('settings');
 		if (isset($_POST['username'])) {
 			$username = $_POST['username'];
 		} else {
-			$l = new \OC_L10n('settings');
 			\OC_JSON::error(array('data' => array('message' => $l->t('No user supplied')) ));
 			exit();
 		}
@@ -78,7 +78,6 @@ class Controller {
 		} elseif ($isUserAccessible) {
 			$userstatus = 'subadmin';
 		} else {
-			$l = new \OC_L10n('settings');
 			\OC_JSON::error(array('data' => array('message' => $l->t('Authentication error')) ));
 			exit();
 		}
@@ -122,7 +121,6 @@ class Controller {
 				$validRecoveryPassword = $keyManager->checkRecoveryPassword($recoveryPassword);
 				$recoveryEnabledForUser = $recovery->isRecoveryEnabledForUser($username);
 			}
-			$l = new \OC_L10n('settings');
 
 			if ($recoveryEnabledForUser && $recoveryPassword === '') {
 				\OC_JSON::error(array('data' => array(