V6.2.3: Fix custom functions defined in plugins (trigger returns an array of...

V6.2.3: Fix custom functions defined in plugins (trigger returns an array of arrays, so we need to flatten it...)

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

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>

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');