From cdb125cf12bc5471044e93a06eb4eaa207fe9ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Raye=CC=81?= Date: Fri, 30 Aug 2013 00:43:28 +0200 Subject: [PATCH 1/2] Add Croatia Country as part of European Union since 1st July 2013 for default european local countries in configuration --- app/code/Mage/Core/etc/config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Mage/Core/etc/config.xml b/app/code/Mage/Core/etc/config.xml index 722e0221f8be0..c654c4576efd1 100644 --- a/app/code/Mage/Core/etc/config.xml +++ b/app/code/Mage/Core/etc/config.xml @@ -565,7 +565,7 @@ - AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB + AT,BE,BG,CY,CZ,DK,EE,FI,FR,DE,GR,HR,HU,IE,IT,LV,LT,LU,MT,NL,PL,PT,RO,SK,SI,ES,SE,GB 0 From af08daa47635a515ba763cd54b007bc5bc97460a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylvain=20Raye=CC=81?= Date: Fri, 30 Aug 2013 00:48:18 +0200 Subject: [PATCH 2/2] Fix an issue of the display of the Add Button Label in Configuration Page for User-Agent Exceptions Configuration > Design > Design Theme --- .../Block/System/Config/Form/Field/Array/Abstract.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/code/Mage/Backend/Block/System/Config/Form/Field/Array/Abstract.php b/app/code/Mage/Backend/Block/System/Config/Form/Field/Array/Abstract.php index 1924f8d6371ae..86cbcc76a4be0 100644 --- a/app/code/Mage/Backend/Block/System/Config/Form/Field/Array/Abstract.php +++ b/app/code/Mage/Backend/Block/System/Config/Form/Field/Array/Abstract.php @@ -270,4 +270,14 @@ public function getColumns() { return $this->_columns; } + + /** + * Return Add Button Label + * + * @return string + */ + public function getAddButtonLabel() + { + return $this->_addButtonLabel; + } }