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

Check we have a WC_Order during email events

This commit is contained in:
Mike Jolley 2017-02-27 17:08:13 +00:00
parent f5a36778fd
commit f2990b0c7d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/class-wc-emails.php
View File

@ -366,12 +366,15 @@ class WC_Emails {
/** /**
* Add customer details to email templates. * Add customer details to email templates.
* *
* @param mixed $order * @param WC_Order $order
* @param bool $sent_to_admin (default: false) * @param bool $sent_to_admin (default: false)
* @param bool $plain_text (default: false) * @param bool $plain_text (default: false)
* @return string * @return string
*/ */
public function customer_details( $order, $sent_to_admin = false, $plain_text = false ) { public function customer_details( $order, $sent_to_admin = false, $plain_text = false ) {
if ( ! is_a( 'WC_Order', $order ) ) {
return;
}
$fields = array(); $fields = array();
if ( $order->get_customer_note() ) { if ( $order->get_customer_note() ) {
@ -408,6 +411,9 @@ class WC_Emails {
* Get the email addresses. * Get the email addresses.
*/ */
public function email_addresses( $order, $sent_to_admin = false, $plain_text = false ) { public function email_addresses( $order, $sent_to_admin = false, $plain_text = false ) {
if ( ! is_a( 'WC_Order', $order ) ) {
return;
}
if ( $plain_text ) { if ( $plain_text ) {
wc_get_template( 'emails/plain/email-addresses.php', array( 'order' => $order ) ); wc_get_template( 'emails/plain/email-addresses.php', array( 'order' => $order ) );
} else { } else {

2
includes/class-wc-structured-data.php
View File

@ -328,7 +328,7 @@ class WC_Structured_Data {
* @param bool $plain_text Plain text email (default: false). * @param bool $plain_text Plain text email (default: false).
*/ */
public function generate_order_data( $order, $sent_to_admin = false, $plain_text = false ) { public function generate_order_data( $order, $sent_to_admin = false, $plain_text = false ) {
if ( $plain_text ) { if ( $plain_text || ! is_a( $order, 'WC_Order' ) ) {
return; return;
} }