Skip to content

Commit

Permalink
Merge remote-tracking branch 'moritzdemmer/individual-admin-login-err…
Browse files Browse the repository at this point in the history
…or-messages' into pr882
  • Loading branch information
Sieg committed Nov 9, 2021
2 parents d98f938 + aad1f16 commit 9574994
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions source/Application/Controller/Admin/LoginController.php
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ public function checklogin()
\OxidEsales\Eshop\Core\Registry::getConfig()->setShopId($iSubshop);
}
} catch (UserException $oEx) {
$myUtilsView->addErrorToDisplay('LOGIN_ERROR');
$myUtilsView->addErrorToDisplay($oEx);
$oStr = getStr();
$this->addTplParam('user', $oStr->htmlspecialchars($sUser));
$this->addTplParam('pwd', $oStr->htmlspecialchars($sPass));
$this->addTplParam('profile', $oStr->htmlspecialchars($sProfile));

return;
} catch (\OxidEsales\Eshop\Core\Exception\CookieException $oEx) {
$myUtilsView->addErrorToDisplay('LOGIN_NO_COOKIE_SUPPORT');
$myUtilsView->addErrorToDisplay($oEx);
$oStr = getStr();
$this->addTplParam('user', $oStr->htmlspecialchars($sUser));
$this->addTplParam('pwd', $oStr->htmlspecialchars($sPass));
Expand Down

0 comments on commit 9574994

Please sign in to comment.