mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21260 from owncloud/fix-undefined-l10n-var 

initialize l10n instance earlier, fixes an undefined var warning foll…
This commit is contained in:
Thomas Müller 2015-12-17 16:08:08 +01:00
parent 3bcaaa6c3a 0ecbfae5ff
commit d402ac91d7
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
settings/changepassword/controller.php
View File

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