diff --git a/Makefile b/Makefile index 94b042d68c265ee864b17794a7f62247a7e96077..f615d274a8b2743c0973e70de08a085eb5cc7952 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BASE=ordernumbers PLATTFORM=woocommerce VENDOR=opentools -VERSION=1.3.7debug +VERSION=1.3.7debug1 DIR = $(shell pwd) SVNDIR=wordpress-plugin-svn diff --git a/opentools-woocommerce-ordernumbers-advanced_v1.3.7debug1.zip b/opentools-woocommerce-ordernumbers-advanced_v1.3.7debug1.zip new file mode 100644 index 0000000000000000000000000000000000000000..54419ceff3e36ae5107a2a3e9be2d012f951d6e3 Binary files /dev/null and b/opentools-woocommerce-ordernumbers-advanced_v1.3.7debug1.zip differ diff --git a/opentools-woocommerce-ordernumbers-basic_v1.3.7debug1.zip b/opentools-woocommerce-ordernumbers-basic_v1.3.7debug1.zip new file mode 100644 index 0000000000000000000000000000000000000000..4ffd725327c42fb863c36dfa34830bfef80fdd19 Binary files /dev/null and b/opentools-woocommerce-ordernumbers-basic_v1.3.7debug1.zip differ diff --git a/plugin-update-checker/plugin-update-checker.php b/plugin-update-checker/plugin-update-checker.php index 4971cc46c906ffd52348eba2bc1ec4551bae7619..d956f6c7d8c9fdedb3710b8c3aed556675c36ae3 100644 --- a/plugin-update-checker/plugin-update-checker.php +++ b/plugin-update-checker/plugin-update-checker.php @@ -902,8 +902,10 @@ class PluginInfo_2_1 { * @return PluginInfo|null New instance of PluginInfo, or NULL on error. */ public static function fromJson($json, $triggerErrors = false){ + $info = new self(); /** @var StdClass $apiResponse */ $apiResponse = json_decode($json); + $info->apiResponse = $apiResponse; if ( empty($apiResponse) || !is_object($apiResponse) ){ if ( $triggerErrors ) { trigger_error( @@ -911,7 +913,8 @@ class PluginInfo_2_1 { E_USER_NOTICE ); } - return null; + $info->fromJson_Error = "PluginInfo_2_1::fromJson: Unable to parse response into JSON object. JSON error: ".json_last_error_msg().", Original response: <pre>".$json."</pre>"; + return $info; } //Very, very basic validation. @@ -923,10 +926,10 @@ class PluginInfo_2_1 { E_USER_NOTICE ); } - return null; + $info->fromJson_Error = "PluginInfo_2_1::fromJson: The plugin metadata file does not contain the required 'name' and 'version' keys."; + return $info; } - $info = new self(); foreach(get_object_vars($apiResponse) as $key => $value){ $info->$key = $value; } diff --git a/woocommerce-advanced-ordernumbers.php b/woocommerce-advanced-ordernumbers.php index 23267efd2b1a487e7d50f4686443543f8a2e97ed..3b66977bcd3667180794cb40e2443a233a895573 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.3.7debug + * Version: 1.3.7debug1 * Author: Open Tools * Author URI: http://open-tools.net * Text Domain: woocommerce-advanced-ordernumbers