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 0000000000000000000000000000000000000000..0af2e10b3bffa5133dad965f3c1f7d97b51b3dda --- /dev/null +++ b/VERSIONS_STABLE/hotline_#21243_fix_default_properties_overwrite_in_widget @@ -0,0 +1 @@ + - ticket #21243: Correction des boîtes qui remplacent les préférences volontairement vidées par les préférences par défauts. \ No newline at end of file diff --git a/library/Class/Profil.php b/library/Class/Profil.php index 55bd1bc50c31c8a135517dc6d1bc73fdcbfb7b1e..c854c5c7b57dcb04fce0733e9b09e24c6af7cf5b 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 16cdc53ae4819a89aaefcce0149ebd9775bc2729..989a0429674f1866fff0ce60926ef0cec5ea2df0 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")]'); } }