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

fixes

This commit is contained in:
Mike Jolley 2012-06-03 13:13:52 +01:00
parent ada45331d0
commit dd8ca7e86d
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
classes/shipping/class-wc-shipping.php
View File

@ -68,12 +68,14 @@ class WC_Shipping {
* @access public * @access public
* @return void * @return void
*/ */
function register_shipping_method( $shipping_method ) { function register_shipping_method( $method ) {
if ( ! is_object( $shipping_method ) ) if ( ! is_object( $method ) )
$shipping_method = new $shipping_method(); $method = new $method();
$this->shipping_methods[ $shipping_method->id ] = $shipping_method; $id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
$this->shipping_methods[ $id ] = $method;
} }
/** /**
@ -119,8 +121,10 @@ class WC_Shipping {
$this->shipping_methods = array(); $this->shipping_methods = array();
foreach ( $sorted_shipping_methods as $methods ) foreach ( $sorted_shipping_methods as $methods )
foreach ( $methods as $method ) foreach ( $methods as $method ) {
$this->shipping_methods[ $method->id ] = $method; $id = empty( $method->instance_id ) ? $method->id : $method->instance_id;
$this->shipping_methods[ $id ] = $method;
}
return $this->shipping_methods; return $this->shipping_methods;
} }
@ -147,7 +151,7 @@ class WC_Shipping {
* @return array * @return array
*/ */
function get_shipping_classes() { function get_shipping_classes() {
if ( ! is_array( $this->shipping_classes ) ) if ( empty( $this->shipping_classes ) )
$this->shipping_classes = ( $classes = get_terms( 'product_shipping_class', array( 'hide_empty' => '0' ) ) ) ? $classes : array(); $this->shipping_classes = ( $classes = get_terms( 'product_shipping_class', array( 'hide_empty' => '0' ) ) ) ? $classes : array();
return $this->shipping_classes; return $this->shipping_classes;