diff --git a/Makefile b/Makefile index f5a38f7d175bd01f46a0e06f83fa2614e5fc9a77..b97a0f56a5f38d48dc03c67d36152bc08d4dd2d3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.2.0 +VERSION=2.2.1 PLUGINFILES=$(BASE).php $(BASE)_base.php $(BASE).script.php $(BASE).xml index.html PLUGINFILES_ADV=$(BASE_ADV).php $(BASE)_base.php $(BASE_ADV).script.php $(BASE_ADV).xml index.html diff --git a/elements/vmlengthunit.php b/elements/vmlengthunit.php index b3186022ce52f315e10ea8618054547da60d5ae9..dbbe351bde8b9a3db6640acc9a2b15b64a6da00d 100644 --- a/elements/vmlengthunit.php +++ b/elements/vmlengthunit.php @@ -39,7 +39,7 @@ class JElementVmLengthUnit extends JElement { */ var $_name = 'LengthUnit'; - function fetchElement($nm, $value, &$node, $control_name) { + function fetchElement($nm, $selected, &$node, $control_name) { // For now, this is a modified copy of ShopFunctions::renderLWHUnitList to use JHTML::_ instead of VmHTML // (which would NOT remove the [ and ] from the ID and thus break the javascript magic!) if (!class_exists ('VmHTML')) { diff --git a/releases/plg_vmshipment_rules_shipping_advanced_v2.2.1.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.2.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..b209e4e56ea8b986a7c6bb480a36cff3c1668ee6 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.2.1.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.2.1.zip b/releases/plg_vmshipment_rules_shipping_v2.2.1.zip new file mode 100644 index 0000000000000000000000000000000000000000..805f10819cf51475f2a9ecee7d4929cc4f9cd755 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.2.1.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index 562531558ee2d3898803600757a3a152a66b9c41..7a8170825f2c9865aba37c1e3da6696ef8dd60c1 100644 --- a/rules_shipping.xml +++ b/rules_shipping.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.kainhofer.com</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.2.0</version> + <version>2.2.1</version> <description>VMSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index ca9a10d486e872675039d073a040181ab7b58a89..ec8abf4e523421d851d1b932d52715be10b218fd 100644 --- a/rules_shipping_advanced.xml +++ b/rules_shipping_advanced.xml @@ -6,7 +6,7 @@ <authorUrl>http://www.kainhofer.com</authorUrl> <copyright>Copyright (C) 2013, Reinhold Kainhofer</copyright> <license>GPL v3+</license> - <version>2.2.0</version> + <version>2.2.1</version> <description>VMSHIPMENT_RULES_ADV_DESC</description> <files> <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename> diff --git a/rules_shipping_base.php b/rules_shipping_base.php index 39c3ef77027ba64c189c3c2959fc4439705cd6fe..9a7cd93586a9bbd114a6f944f5140fc26243f09e 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -647,7 +647,6 @@ class ShippingRule { case '~': $l=min(strlen($terms[0]), strlen($terms[2])); $res = (strncmp ($terms[0], $terms[2], $l) == 0); -JFactory::getApplication()->enqueueMessage("String-comparing $terms[0] and $terms[2] ($l chars), result=$res", 'error'); break; default: JFactory::getApplication()->enqueueMessage(JText::sprintf('VMSHIPMENT_RULES_UNKNOWN_OPERATOR', $terms[1], $this->rulestring), 'error');