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

Fixes legacy_posted_data access and adds notices if accessed.

This commit is contained in:
Mike Jolley 2017-04-18 21:55:31 +01:00
parent 372656d137
commit add7170f34
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
includes/class-wc-checkout.php
View File

@ -30,6 +30,12 @@ class WC_Checkout {
*/
protected $fields = null;
/**
* Holds posted data for backwards compatibility.
* @var array
*/
protected $legacy_posted_data = array();
/**
* Gets the main WC_Checkout Instance.
*
@ -103,7 +109,7 @@ class WC_Checkout {
case 'shipping_methods' :
WC()->session->set( 'chosen_shipping_methods', $value );
break;
case 'legacy_posted_data' :
case 'posted' :
$this->legacy_posted_data = $value;
break;
}
@ -116,7 +122,7 @@ class WC_Checkout {
* @return string
*/
public function __get( $key ) {
if ( in_array( $key, array( 'posted', 'shipping_method', 'payment_method' ) ) && ! $this->legacy_posted_data ) {
if ( in_array( $key, array( 'posted', 'shipping_method', 'payment_method' ) ) && empty( $this->legacy_posted_data ) ) {
$this->legacy_posted_data = $this->get_posted_data();
}
switch ( $key ) {
@ -129,6 +135,7 @@ class WC_Checkout {
case 'checkout_fields' :
return $this->get_checkout_fields();
case 'posted' :
wc_doing_it_wrong( 'WC_Checkout->posted', 'Use $_POST directly, or the WC_Checkout->get_posted_data() method.', '3.0.0' );
return $this->legacy_posted_data;
case 'shipping_method' :
return $this->legacy_posted_data['shipping_method'];
@ -555,6 +562,9 @@ class WC_Checkout {
}
$data[ $key ] = apply_filters( 'woocommerce_process_checkout_' . $type . '_field', apply_filters( 'woocommerce_process_checkout_field_' . $key, $value ) );
// BW compatibility.
$this->legacy_posted_data[ $key ] = $data[ $key ];
}
}
@ -954,7 +964,7 @@ class WC_Checkout {
* @return string
*/
public function get_posted_address_data( $key, $type = 'billing' ) {
if ( 'billing' === $type || false === $this->posted_data['ship_to_different_address'] ) {
if ( 'billing' === $type || false === $this->legacy_posted_data['ship_to_different_address'] ) {
$return = isset( $this->legacy_posted_data[ 'billing_' . $key ] ) ? $this->legacy_posted_data[ 'billing_' . $key ] : '';
} else {
$return = isset( $this->legacy_posted_data[ 'shipping_' . $key ] ) ? $this->legacy_posted_data[ 'shipping_' . $key ] : '';