diff --git a/Makefile b/Makefile index 3fc0819bd7492f58623bace6db03e728fda8232e..6b4894d1b1f9cc865250ad81141659c8f69297eb 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=ordernumbers PLATTFORM=woocommerce VENDOR=opentools -VERSION=1.4.1 +VERSION=1.4.2 DIR = $(shell pwd) SVNDIR=wordpress-plugin-svn diff --git a/library/ordernumber_helper.php b/library/ordernumber_helper.php index 0d6f49ad889a2d23af17a6d5f1fff1b1d9d65918..69159fd0b854ee65427b6b4f8e5350c495e04e43 100644 --- a/library/ordernumber_helper.php +++ b/library/ordernumber_helper.php @@ -300,7 +300,12 @@ class OrdernumberHelper { case 'nocondition': $match = true; break; case 'equals': - $match = ($compareval == $condval); break; + if (is_array($compareval)) { + $match = ($condval == '') && empty($compareval); + } else { + $match = ($compareval == $condval); + } + break; case 'contains': if (is_array($compareval)) { $match = in_array($condval, $compareval); diff --git a/opentools-update-checker.php b/opentools-update-checker.php index 6e30c59cccc158ec86d01d0a51bff094485a47ce..b97599699b7176b2813510e5f883acb86e57b091 100644 --- a/opentools-update-checker.php +++ b/opentools-update-checker.php @@ -242,7 +242,7 @@ class OpenToolsPluginUpdateChecker extends PluginUpdateChecker_2_1 { } else { $message = __('Unable to access plugin download URL. Please check your credentials.'); if ($this->debugMode) { - $message .= "<pre>updateinfo: ".print_r($updateinfo,1)."</pre>"; + $message .= "<pre>updateinfo: ".htmlspecialchars(print_r($updateinfo,1))."</pre>"; } } return $success; diff --git a/ordernumbers_woocommerce.php b/ordernumbers_woocommerce.php index 1ce0dd775b98919116cd3e3ab836f3078f1967c2..7ab295965a4e1e91ea655a62526a02699c1407a2 100644 --- a/ordernumbers_woocommerce.php +++ b/ordernumbers_woocommerce.php @@ -367,6 +367,7 @@ class OpenToolsOrdernumbers extends OpenToolsOrdernumbersBasic { public function setupThirdPartyReplacements (&$reps, $details, $nrtype) { $reps = apply_filters( 'opentools_ordernumber_replacements', $reps, $details, $nrtype); +// error_log("All replacements: ".print_r($reps, 1)); } diff --git a/readme.txt b/readme.txt index c92288702e34e11e9bf81335d0b57a65cce114b5..daf21917803dfe94e3c286683d6269a8daa30d0c 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Contributors: opentools Tags: WooCommerce, Order numbers, orders Requires at least: 4.0 Tested up to: 4.8 -Stable tag: 1.4.1 +Stable tag: 1.4.2 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl.html @@ -78,6 +78,9 @@ The Advanced Ordernumbers for WooCommerce plugin supports some invoicing plugins == Changelog == += 1.4.2 = +* Allow comparing arrays with empty value in the variable definitions + = 1.4.1 = * Fix searching order numbers, sorting by order number in the order list diff --git a/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.2.zip b/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..3942320cbd92c1690e43bf3e825ec4837d252a83 Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-advanced_v1.4.2.zip differ diff --git a/releases/opentools-woocommerce-ordernumbers-basic_v1.4.2.zip b/releases/opentools-woocommerce-ordernumbers-basic_v1.4.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..f75f62b90ff2e8bf4a1167de08de71c0a6d290aa Binary files /dev/null and b/releases/opentools-woocommerce-ordernumbers-basic_v1.4.2.zip differ diff --git a/woocommerce-advanced-ordernumbers.php b/woocommerce-advanced-ordernumbers.php index 3cfb4a9111bb97364da186fde55037986cd27812..e40dc8b33944d013bdeea0f22ceb101416601050 100644 --- a/woocommerce-advanced-ordernumbers.php +++ b/woocommerce-advanced-ordernumbers.php @@ -3,7 +3,7 @@ * Plugin Name: Woocommerce Advanced Ordernumbers * Plugin URI: http://open-tools.net/woocommerce/advanced-ordernumbers-for-woocommerce.html * Description: Lets the user freely configure the order numbers in WooCommerce. - * Version: 1.4.1 + * Version: 1.4.2 * Author: Open Tools * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-ordernumbers @@ -11,7 +11,7 @@ * License: GPL2+ * Network: true * WC requires at least: 2.2 - * WC tested up to: 3.0 + * WC tested up to: 3.1 */ if ( ! defined( 'ABSPATH' ) ) { diff --git a/woocommerce-basic-ordernumbers.php b/woocommerce-basic-ordernumbers.php index 5e814d827df4c80103c2d2df75e22aa8872c2c68..5a59c1fd66287221a9a995f7fee9fb077ba79757 100644 --- a/woocommerce-basic-ordernumbers.php +++ b/woocommerce-basic-ordernumbers.php @@ -3,14 +3,14 @@ * Plugin Name: WooCommerce Basic Ordernumbers * Plugin URI: http://open-tools.net/woocommerce/advanced-ordernumbers-for-woocommerce.html * Description: Configure WooCommerce ordernumbers to have a running counter and arbitrary, fixed text (prefix / postfix). - * Version: 1.4.1 + * Version: 1.4.2 * Author: Open Tools * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-ordernumbers * License: GPL2+ * Network: true * WC requires at least: 2.2 - * WC tested up to: 3.0 + * WC tested up to: 3.1 */ if ( ! defined( 'ABSPATH' ) ) {