From c9c48b718e0622f69cd11454f82c9709bf4d7e9d Mon Sep 17 00:00:00 2001 From: Evan Mattson Date: Tue, 16 Jun 2015 21:36:36 -0400 Subject: [PATCH 1/2] identify current section by email key to be consistent --- includes/admin/settings/class-wc-settings-emails.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php index ca1a52310ff..a8045734ff9 100644 --- a/includes/admin/settings/class-wc-settings-emails.php +++ b/includes/admin/settings/class-wc-settings-emails.php @@ -174,9 +174,9 @@ class WC_Settings_Emails extends WC_Settings_Page { if ( $current_section ) { - foreach ( $email_templates as $email ) { + foreach ( $email_templates as $email_key => $email ) { - if ( strtolower( get_class( $email ) ) == $current_section ) { + if ( strtolower( $email_key ) == $current_section ) { $email->admin_options(); break; } From 2181cd1d260dbe4f2d56612cc26bc4cb91e7fbda Mon Sep 17 00:00:00 2001 From: Evan Mattson Date: Tue, 16 Jun 2015 21:37:54 -0400 Subject: [PATCH 2/2] rename $email_id to $email_key `$email_id` here is not the same as `$email->id`, renaming to show this, and for consistency with similar code --- includes/admin/settings/class-wc-settings-emails.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/admin/settings/class-wc-settings-emails.php b/includes/admin/settings/class-wc-settings-emails.php index a8045734ff9..3ca7acb05ab 100644 --- a/includes/admin/settings/class-wc-settings-emails.php +++ b/includes/admin/settings/class-wc-settings-emails.php @@ -47,10 +47,10 @@ class WC_Settings_Emails extends WC_Settings_Page { $mailer = WC()->mailer(); $email_templates = $mailer->get_emails(); - foreach ( $email_templates as $email_id => $email ) { + foreach ( $email_templates as $email_key => $email ) { $title = empty( $email->title ) ? ucfirst( $email->id ) : ucfirst( $email->title ); - $sections[ strtolower( $email_id ) ] = esc_html( $title ); + $sections[ strtolower( $email_key ) ] = esc_html( $title ); } return apply_filters( 'woocommerce_get_sections_' . $this->id, $sections );