Merge pull request #192 from PrestaShop/dev

Release 6.0.5

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>ps_linklist</name>
     <displayName><![CDATA[Link List]]></displayName>
-    <version><![CDATA[6.0.4]]></version>
+    <version><![CDATA[6.0.5]]></version>
     <description><![CDATA[Adds a block with several links.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

ps_linklist.php

@@ -73,7 +73,7 @@ public function __construct()
     {
         $this->name = 'ps_linklist';
         $this->author = 'PrestaShop';
-        $this->version = '6.0.4';
+        $this->version = '6.0.5';
         $this->need_instance = 0;
         $this->tab = 'front_office_features';
 

src/Controller/Admin/Improve/Design/LinkBlockController.php

@@ -28,16 +28,10 @@
 use PrestaShop\PrestaShop\Core\Form\FormHandlerInterface;
 use PrestaShopBundle\Controller\Admin\FrameworkBundleAdminController;
 use PrestaShopBundle\Security\Annotation\AdminSecurity;
-use PrestaShopBundle\Security\Annotation\ModuleActivated;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
-/**
- * Class LinkBlockController.
- *
- * @ModuleActivated(moduleName="ps_linklist", redirectRoute="admin_module_manage")
- */
 class LinkBlockController extends FrameworkBundleAdminController
 {
     /**
@@ -198,7 +192,7 @@ public function deleteAction($linkBlockId)
     public function updatePositionsAction(Request $request, $hookId)
     {
         $positionsData = [
-            'positions' => $request->request->get('positions', null),
+            'positions' => $request->request->all()['positions'],
             'parentId' => $hookId,
         ];
 

upgrade/install-1.3.php → upgrade/install-1.3.0.php

@@ -21,7 +21,7 @@
     exit;
 }
 
-function upgrade_module_1_3($object)
+function upgrade_module_1_3_0($object)
 {
     return $object->registerHook('actionObjectCmsUpdateAfter') && $object->registerHook('actionObjectCmsDeleteAfter');
 }

upgrade/install-1.4.php → upgrade/install-1.4.0.php

@@ -21,7 +21,7 @@
     exit;
 }
 
-function upgrade_module_1_4($object)
+function upgrade_module_1_4_0($object)
 {
     return $object->registerHook('actionAdminStoresControllerUpdate_optionsAfter');
 }

upgrade/upgrade-3.0.php → upgrade/upgrade-3.0.0.php

@@ -21,7 +21,7 @@
     exit;
 }
 
-function upgrade_module_3_0($object)
+function upgrade_module_3_0_0($object)
 {
     Configuration::deleteByName('FOOTER_CMS');
     Configuration::deleteByName('FOOTER_BLOCK_ACTIVATION');

upgrade/upgrade-4.0.php → upgrade/upgrade-4.0.0.php

@@ -21,7 +21,7 @@
     exit;
 }
 
-function upgrade_module_4_0($object)
+function upgrade_module_4_0_0($object)
 {
     $result = true;
     $result &= Db::getInstance()->execute('UPDATE `' . _DB_PREFIX_ . 'tab` SET `route_name` = "admin_link_block_list" WHERE `class_name` = "AdminLinkWidget"');

upgrade/upgrade-5.0.php → upgrade/upgrade-5.0.0.php

@@ -21,7 +21,7 @@
     exit;
 }
 
-function upgrade_module_5_0()
+function upgrade_module_5_0_0()
 {
     $result = true;
     $result &= Db::getInstance()->execute('ALTER TABLE `' . _DB_PREFIX_ . 'link_block_shop`  ADD COLUMN `position` int(10) unsigned NOT NULL DEFAULT 0');