diff --git a/Makefile b/Makefile index 87fcc51d5e71dd15f7732f26764c0288513a8609..3e9db5052bceef60e6e7f905ef2486c9b4b1f89c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment ZIPBASE=opentools_vm -VERSION=6.2.2 +VERSION=6.2.3 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE).script.php $(BASE).xml index.html PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE)_framework_joomla.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html diff --git a/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.3.zip b/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..ac51b64f2bad4d4682b2ebfc566eb92be0dc69c5 Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_advanced_v6.2.3.zip differ diff --git a/releases/plg_opentools_vm_rules_shipping_v6.2.3.zip b/releases/plg_opentools_vm_rules_shipping_v6.2.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..f500813e0d4f06c03de8ddd6f8b925e943d2fb07 Binary files /dev/null and b/releases/plg_opentools_vm_rules_shipping_v6.2.3.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 75c92c43c1c06a04bb7ed2fc25a55d4028c51ccc..1dd673f64decc72234045cbb0bbe0dcdf0b8ef37 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.open-tools.net</authorUrl> <copyright>Copyright (C) 2013-2014, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>6.2.2</version> + <version>6.2.3</version> <description>OTSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_framework_joomla.php b/rules_shipping_framework_joomla.php index 6c41bb68474b0e482dbc7a905aa8489906e2b1e6..eeb6f71d7dfcc0f56a2eaf910d08cebc90c76526 100644 --- a/rules_shipping_framework_joomla.php +++ b/rules_shipping_framework_joomla.php @@ -37,7 +37,7 @@ class RulesShippingFrameworkJoomla extends RulesShippingFramework { // ...); JPluginHelper::importPlugin('vmshipmentrules'); $dispatcher = JDispatcher::getInstance(); - $custfuncdefs = $dispatcher->trigger('onVmShippingRulesRegisterCustomFunctions',array()); + $custfuncdefs = call_user_func_array('array_merge', $dispatcher->trigger('onVmShippingRulesRegisterCustomFunctions',array())); $custfuncdefs['convertfromcurrency'] = array($this, 'convert_from_currency'); $custfuncdefs['converttocurrency'] = array($this, 'convert_to_currency');