V5.6: Fix shipping rate 0 without shipping= in the free plugin (already fixed...

V5.6: Fix shipping rate 0 without shipping= in the free plugin (already fixed in the advanced version)

Makefile

@@ -2,7 +2,7 @@ BASE=rules_shipping
 BASE_ADV=rules_shipping_advanced
 PLUGINTYPE=vmshipment
 ZIPBASE=opentools_vm
-VERSION=5.5
+VERSION=5.6
 
 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

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>5.5</version>
+    <version>5.6</version>
     <description>VMSHIPMENT_RULES_DESC</description>
     <files>
         <filename plugin="rules_shipping">rules_shipping.php</filename>

rules_shipping_advanced.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>5.5</version>
+    <version>5.6</version>
     <description>VMSHIPMENT_RULES_ADV_DESC</description>
     <files>
         <filename plugin="rules_shipping_advanced">rules_shipping_advanced.php</filename>

rules_shipping_base.php

@@ -1045,7 +1045,7 @@ class ShippingRule {
 		/* In the advanced version, all conditions and costs can be given as a full mathematical expression */
 		/* Both versions create an expression tree, which can be easily evaluated in evaluateTerm */
 		$rulepart = trim($rulepart);
-		if (empty($rulepart)) return;
+		if (!isset($rulepart) || $rulepart==='') return;
 
 		
 		// Special-case the name assignment, where we don't want to interpret the value as an arithmetic expression!
@@ -1056,7 +1056,6 @@ class ShippingRule {
 
 		// Split at all operators:
 		$atoms = $this->tokenize_expression ($rulepart);
-		
 		/* TODO: Starting from here, the advanced plugin is different! */
 		$operators = array('<', '<=', '=', '>', '>=', '=>', '=<', '<>', '!=', '==');
 		if (count($atoms)==1) {