minor fixes and version bump

albertorrent · Mar 8, 2012 · 6e50486 · 6e50486
1 parent dac2842
commit 6e50486
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/admin/woocommerce-admin-settings.php b/admin/woocommerce-admin-settings.php
@@ -562,7 +562,7 @@
 		'desc' 		=> __( 'This controls what unit you will define weights in.', 'woocommerce' ),
 		'id' 		=> 'woocommerce_weight_unit',
 		'css' 		=> 'min-width:150px;',
-		'std' 		=> 'GBP',
+		'std' 		=> 'kg',
 		'type' 		=> 'select',
 		'options' => array( 
 			'kg'  => __( 'kg', 'woocommerce' ),

diff --git a/assets/js/woocommerce.min.js b/assets/js/woocommerce.min.js
diff --git a/assets/js/woocommerce_plugins.js b/assets/js/woocommerce_plugins.js
@@ -1,8 +1,17 @@
 /*!
  * jQuery blockUI plugin
+ * Version 2.39 (23-MAY-2011)
+ * @requires jQuery v1.2.3 or later
+ *
+ * Examples at: http://malsup.com/jquery/block/
  * Copyright (c) 2007-2010 M. Alsup
  * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ * Thanks to Amir-Hossein Sobhi for some excellent contributions!
  */
+
 ;(function($) {
 
 if (/1\.(0|1|2)\.(0|1|2)/.test($.fn.jquery) || /^1.1/.test($.fn.jquery)) {

diff --git a/classes/class-wc-validation.php b/classes/class-wc-validation.php
@@ -115,6 +115,8 @@ function format_postcode( $postcode, $country ) {
 		if ($country=='GB') :
 			if (strlen($postcode)==7) 
 				$postcode = substr_replace($postcode, ' ', 4, 0);
+			elseif (strlen($postcode)==5) 
+				$postcode = substr_replace($postcode, ' ', 2, 0);
 			else 
 				$postcode = substr_replace($postcode, ' ', 3, 0);
 		endif;

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, store, sh
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal@woothemes.com&item_name=Donation+for+WooCommerce
 Requires at least: 3.3
 Tested up to: 3.3
-Stable tag: 1.5
+Stable tag: 1.5.1
 
 WooCommerce is a powerful, extendable eCommerce plugin that helps you sell anything. Beautifully.
 
@@ -143,7 +143,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 
 == Changelog ==
 
-= 1.5.1 =
+= 1.5.1 - 08/03/2012 =
 * Persistent (logged-in) customer carts (thanks dominic-p)
 * Error suppression on set_time_out
 * Order-details removed shipping when disabled
@@ -164,6 +164,7 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
 * Fix for grouped product from price
 * Store less cart data in sessions to reduce file sizes
 * Minimum spend option for coupons (thanks to jason whitaker)
+* 5 digit UK postcode handling
 
 = 1.5 - 01/03/2012 =
 * Quick edit products

diff --git a/woocommerce.php b/woocommerce.php
@@ -3,7 +3,7 @@
 Plugin Name: WooCommerce
 Plugin URI: http://www.woothemes.com/woocommerce/
 Description: An e-commerce toolkit that helps you sell anything. Beautifully.
-Version: 1.5
+Version: 1.5.1
 Author: WooThemes
 Author URI: http://woothemes.com
 Requires at least: 3.1
@@ -29,7 +29,7 @@ class Woocommerce {
 
 	/** Version ***************************************************************/
 
-	var $version = '1.5';
+	var $version = '1.5.1';
 
 	/** URLS ******************************************************************/