initialize l10n instance earlier, fixes an undefined var warning followed by a php error
This commit is contained in:
parent
38f4407761
commit
0ecbfae5ff
|
@ -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(
|
||||||
|
|
Loading…
Reference in New Issue