Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/release-11-fix' 

Conflicts:
	assets/js/frontend/woocommerce.min.js
	includes/class-wc-checkout.php
	readme.txt
	woocommerce.php
This commit is contained in:
Coen Jacobs 2013-06-13 15:36:12 +02:00
parent c72ae714f7 bad3fa581b
commit 035ec8ba65
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
readme.txt
View File

@ -3,8 +3,8 @@ Contributors: woothemes, mikejolley, jameskoster, CoenJacobs
Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, affiliate, store, sales, sell, shop, shopping, cart, checkout, configurable, variable, widgets, reports, download, downloadable, digital, inventory, stock, reports, shipping, tax Tags: ecommerce, e-commerce, commerce, woothemes, wordpress ecommerce, affiliate, store, sales, sell, shop, shopping, cart, checkout, configurable, variable, widgets, reports, download, downloadable, digital, inventory, stock, reports, shipping, tax
Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal@woothemes.com&item_name=Donation+for+WooCommerce Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=paypal@woothemes.com&item_name=Donation+for+WooCommerce
Requires at least: 3.5 Requires at least: 3.5
Tested up to: 3.6 beta 2 Tested up to: 3.6 beta 3
Stable tag: 2.0.10 Stable tag: 2.0.11
License: GPLv3 License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html License URI: http://www.gnu.org/licenses/gpl-3.0.html
@ -203,6 +203,17 @@ Yes you can! Join in on our [GitHub repository](http://github.com/woothemes/wooc
* Localization - Swedish translation by Björn Sennbrink * Localization - Swedish translation by Björn Sennbrink
* Localization - French, Spanish, Romanian, Danish, Korean, Arabic updates. * Localization - French, Spanish, Romanian, Danish, Korean, Arabic updates.
= 2.0.11 - 13/06/2013 =
* Tweak - Handling for multiselect fields on checkout, and a filter for third party handling
* Fix - Duplicate param keys for sale_product shortcodes
* Fix - Google Analytics tracking use get_order_number() method instead of id
* Fix - Replaced jQuery placeholder plugin to provide support in older browsers
* Fix - Rounding for mijireh tax ex. price
* Fix - Fixed is_on_sale function for products without prices
* Fix - Updated blockui to prevent errors in WP 3.6
* Fix - Extra data sanitization in some places
* Fix - Offer tax class option per variation to use same tax class as parent
= 2.0.10 - 15/05/2013 = = 2.0.10 - 15/05/2013 =
* Tweak - Searching for SKU in admin panel can also be done via lowercase 'sku:' instead of just 'SKU:' * Tweak - Searching for SKU in admin panel can also be done via lowercase 'sku:' instead of just 'SKU:'
* Fix - Cast term_id as int in product data write panel that will resolve issues with numerical attributes * Fix - Cast term_id as int in product data write panel that will resolve issues with numerical attributes

3
woocommerce.php
View File

@ -30,7 +30,6 @@ if ( ! class_exists( 'WooCommerce' ) ) :
* @author WooThemes * @author WooThemes
*/ */
final class WooCommerce { final class WooCommerce {
/** /**
* @var WooCommerce The single instance of WooCommerce * @var WooCommerce The single instance of WooCommerce
* @since 2.1 * @since 2.1
@ -1099,4 +1098,4 @@ function WC() {
} }
// Global for backwards compatibilty. // Global for backwards compatibilty.
$GLOBALS['woocommerce'] = WC(); $GLOBALS['woocommerce'] = WC();