dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #849 from djfm/bootstrap

Browse Source 
// Translations fix
This commit is contained in:
Damien Metzger
2013-10-18 09:35:20 -07:00
parent 6c37efdb6a 5a3d487e9f
commit d1a2c33322
9 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminLoginController.php
+3 -3
View File
@@ -67,9 +67,9 @@ class AdminLoginControllerCore extends AdminController
if ($clientIsMaintenanceOrLocal)
$this->errors[] = Tools::displayError('SSL is activated. However, your IP is allowed to enter unsecure mode for maintenance or local IP issues.');
else
{
$warningSslMessage = Tools::displayError('SSL is activated. Please connect using the following link to ');
$warningSslMessage .= '<a href="https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']).'">log into secure mode (https://)</a>';
{
$url = 'https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']);
$warningSslMessage = sprintf(Tools::displayError('SSL is activated. Please connect using the following link to <a href="%s">log into secure mode (https://)</a>'), $url);
$this->context->smarty->assign(array('warningSslMessage' => $warningSslMessage));
}
}