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

// Small fixes

Browse Source
This commit is contained in:
rGaillard
2012-09-11 14:01:50 +00:00
parent 9739fb3d59
commit 02f93b09f5
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminMetaController.php
+14 -4
View File
@@ -498,8 +498,13 @@ class AdminMetaControllerCore extends AdminController
{
if (!Shop::isFeatureActive() && $this->url && $this->url->domain != $value)
{
$this->url->domain = $value;
$this->url->update();
if (Validate::isCleanHtml($value))
{
$this->url->domain = $value;
$this->url->update();
}
else
$this->errors[] = Tools::displayError('Domain is not valid');
}
}
@@ -510,8 +515,13 @@ class AdminMetaControllerCore extends AdminController
{
if (!Shop::isFeatureActive() && $this->url && $this->url->domain_ssl != $value)
{
$this->url->domain_ssl = $value;
$this->url->update();
if (Validate::isCleanHtml($value))
{
$this->url->domain_ssl = $value;
$this->url->update();
}
else
$this->errors[] = Tools::displayError('SSL Domain is not valid');
}
}
controllers/admin/AdminProductsController.php
+1 -1
View File
@@ -135,7 +135,7 @@ class AdminProductsControllerCore extends AdminController
'title' => $this->l('Displayed'),
'width' => 70,
'active' => 'status',
'filter_key' => 'a!active',
'filter_key' => 'sa!active',
'align' => 'center',
'type' => 'bool',
'orderby' => false