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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
Rémi Gaillard
2013-07-18 18:31:35 +02:00
parent 958d92c9fa c70fe92dac
commit 354622857f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCountriesController.php
+3 -3
View File
@@ -433,10 +433,10 @@ class AdminCountriesControllerCore extends AdminController
public function processStatus()
{
$return = parent::processStatus();
parent::processStatus();
if (Validate::isLoadedObject($object = $this->loadObject()) && $object->active == 1)
$return &= Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());
return $return;
return Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());
return false;
}
public function processBulkStatusSelection($way)