diff --git a/Makefile b/Makefile index f297538b1852259dd04214f938690275f4522d3f..f11c60075ebbdb4d6a26e43de0651e0cd69ab5e0 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=rules_shipping BASE_ADV=rules_shipping_advanced PLUGINTYPE=vmshipment -VERSION=2.1.2 +VERSION=2.1.3 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/releases/plg_vmshipment_rules_shipping_advanced_v2.1.3.zip b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..7ebb4dad9dc794c4bab092b0f9a3fbf2dd1a2964 Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_advanced_v2.1.3.zip differ diff --git a/releases/plg_vmshipment_rules_shipping_v2.1.3.zip b/releases/plg_vmshipment_rules_shipping_v2.1.3.zip new file mode 100644 index 0000000000000000000000000000000000000000..ccdaa015d9676612bbe7ffbb48dc6614315c52de Binary files /dev/null and b/releases/plg_vmshipment_rules_shipping_v2.1.3.zip differ diff --git a/rules_shipping.xml b/rules_shipping.xml index b673f8deaa7a6ac56c5b6853d9443d17fa779ff1..811fa857896e2e77c5ed6d63c330fdc385d42f03 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.1.2</version> + <version>2.1.3</version> <description>VMSHIPMENT_RULES_DESC</description> <files> <filename plugin="rules_shipping">rules_shipping.php</filename> diff --git a/rules_shipping_advanced.php b/rules_shipping_advanced.php index 70210c3e19a1cf6f35c70ad7e5d2af7e98a2ee4d..6d00afa3bba3156b5cec26b161660d8577498482 100644 --- a/rules_shipping_advanced.php +++ b/rules_shipping_advanced.php @@ -277,6 +277,7 @@ class ShippingRule_Advanced extends ShippingRule { $this->shipping = $res; $this->includes_tax = False; } +// JFactory::getApplication()->enqueueMessage("<pre>Rule part '$rulepart' parsed into: ".print_r($res,1)."</pre>", 'error'); } diff --git a/rules_shipping_advanced.xml b/rules_shipping_advanced.xml index 8b42050f526a29d8ba46babebf51777e61b28866..49db8619a67946a37d0fb01b6045ac3f1e1e11ac 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.1.2</version> + <version>2.1.3</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 8ab0feeb72695a6f22eba7bd632623af49afcb26..876aadb661191e96ca7f8f6ca77b7b1e08a22ae7 100644 --- a/rules_shipping_base.php +++ b/rules_shipping_base.php @@ -197,13 +197,13 @@ class plgVmShipmentRules_Shipping_Base extends vmPSPlugin { $return = $this->displayLogos ($logos) . ' '; } if (!empty($plugin->$plugin_desc)) { - $description = '<span class="' . $this->_type . '_description">' . htmlspecialchars($plugin->$plugin_desc) . '</span>'; + $description = '<span class="' . $this->_type . '_description">' . $plugin->$plugin_desc . '</span>'; } $rulename=''; if (!empty($plugin->rule_name)) { $rulename=" (".htmlspecialchars($plugin->rule_name).")"; } - $pluginName = $return . '<span class="' . $this->_type . '_name">' . htmlspecialchars($plugin->$plugin_name) . $rulename.'</span>' . $description; + $pluginName = $return . '<span class="' . $this->_type . '_name">' . $plugin->$plugin_name . $rulename.'</span>' . $description; return $pluginName; }