From a487ce1712a5dfd2439ebf82d10eab2ab7425a8b Mon Sep 17 00:00:00 2001
From: efalcy <efalcy@afi-sa.fr>
Date: Thu, 8 Oct 2015 15:43:07 +0200
Subject: [PATCH] dev #19211 recuperation visuels cd : fix tests
---
.../admin/controllers/ModulesController.php | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/application/modules/admin/controllers/ModulesController.php b/application/modules/admin/controllers/ModulesController.php
index a66a0671603..eea626f7e69 100644
--- a/application/modules/admin/controllers/ModulesController.php
+++ b/application/modules/admin/controllers/ModulesController.php
@@ -329,13 +329,22 @@ class Admin_ModulesController extends ZendAfi_Controller_Action {
protected function processZones($zone_name) {
$links_zones = $this->_getParam($zone_name.'_zone', []);
$links_fields = $this->_getParam($zone_name.'_url', []);
- if ($zone_name == 'link')
- $links_labels = $this->_getParam('link_label', []);
+ $links_labels = ($zone_name == 'link')
+ ? $this->_getParam('link_label', [])
+ : [];
$packer = new Class_Profil_ConfigPacker();
for ($i = 0; $i < count($links_zones); $i++) {
- if ('' == $links_zones[$i] && '' == $links_fields[$i])
- continue;
- $packer->add([$links_zones[$i], $links_fields[$i]]);
+
+ if ($links_zones[$i] == ''
+ && $links_fields[$i] == ''
+ && (($zone_name == 'link') ? ($links_labels[$i] == '') : 1))
+ continue;
+
+ $data = [$links_zones[$i], $links_fields[$i]];
+
+ if ($zone_name == 'link')
+ $data[] = $links_labels[$i];
+ $packer->add($data);
}
return $packer->pack();
--
GitLab