From d2efef5a1c08056b9d7bc6e2a3feae9377c6640b Mon Sep 17 00:00:00 2001
From: Peter Fabian <peter.fabian.github@gmail.com>
Date: Mon, 9 Apr 2018 16:39:14 +0200
Subject: [PATCH] Handling of PHP's automatic array key conversion to int

---
 includes/admin/wc-meta-box-functions.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/admin/wc-meta-box-functions.php b/includes/admin/wc-meta-box-functions.php
index 120d6e1db13..22a84ad1c3b 100644
--- a/includes/admin/wc-meta-box-functions.php
+++ b/includes/admin/wc-meta-box-functions.php
@@ -227,7 +227,9 @@ function woocommerce_wp_select( $field ) {
 		<select <?php echo wc_implode_html_attributes( $field_attributes ); // WPCS: XSS ok. ?>>
 			<?php
 			foreach ( $field['options'] as $key => $value ) {
-				echo '<option value="' . esc_attr( $key ) . '" ' . selected( $field['value'] === $key || ( is_array( $field['value'] ) && in_array( $key, $field['value'], true ) ), true, false ) . '>' . esc_html( $value ) . '</option>';
+				// In case the value is an array, the $key from options might have been converted to int automatically by PHP,
+				// thus the comparison needs to check both $key and (string)$key.
+				echo '<option value="' . esc_attr( $key ) . '" ' . selected( $field['value'] === $key || ( is_array( $field['value'] ) && ( in_array( $key, $field['value'], true ) || in_array( (string) $key, $field['value'], true ) ) ), true, false ) . '>' . esc_html( $value ) . '</option>';
 			}
 			?>
 		</select>