From 0f84e073b222070dc989a4d9c1113d7185d39729 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Fri, 13 Feb 2015 10:29:37 +0100
Subject: [PATCH] hotline #21243 fix default properties overwrite in widget
---
.../hotline_#21243_fix_default_properties_overwrite_in_widget | 1 +
library/Class/Profil.php | 2 +-
.../controllers/AccueilControllerConteneurDeuxColonnesTest.php | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 VERSIONS_STABLE/hotline_#21243_fix_default_properties_overwrite_in_widget
diff --git a/VERSIONS_STABLE/hotline_#21243_fix_default_properties_overwrite_in_widget b/VERSIONS_STABLE/hotline_#21243_fix_default_properties_overwrite_in_widget
new file mode 100644
index 00000000000..dc5c47db5da
--- /dev/null
+++ b/VERSIONS_STABLE/hotline_#21243_fix_default_properties_overwrite_in_widget
@@ -0,0 +1 @@
+ - ticket #21243: Correction d'un bug dans les boîtes qui utilsait les préférences par défaut quand les préfénreces étaient volotairement vide.
\ No newline at end of file
diff --git a/library/Class/Profil.php b/library/Class/Profil.php
index 55bd1bc50c3..c854c5c7b57 100644
--- a/library/Class/Profil.php
+++ b/library/Class/Profil.php
@@ -593,7 +593,7 @@ class Class_Profil extends Storm_Model_Abstract {
$default_prefs = array_merge($default_prefs, ['id_module' => $id_module]);
$module['preferences'] = (!array_isset('preferences', $module)) ?
- $default_prefs : array_merge($default_prefs, array_filter($module['preferences']));
+ $default_prefs : array_merge($default_prefs, $module['preferences']);
return $module;
}
diff --git a/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php b/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php
index 16cdc53ae48..989a0429674 100644
--- a/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php
+++ b/tests/application/modules/admin/controllers/AccueilControllerConteneurDeuxColonnesTest.php
@@ -281,7 +281,7 @@ class AccueilControllerConteneurDeuxColonnesNewTest extends Admin_AbstractContro
$this->dispatch('/opac?id_profil=34');
$this->assertXPathContentContains('//div', 'Le catalogue contient');
- $this->assertXPathContentContains('//div', 'Recherche guidée', $this->_response->getBody());
+ $this->assertXPath('//div[contains(@class,"conteneur_deux_colonnes")]//div[contains(@class,"rech_guide")]');
}
}
--
GitLab