From ff50cbdff89aaa1226743853fa5f672cb4eee8b7 Mon Sep 17 00:00:00 2001
From: nobu <big-me@n-k-y.net>
Date: Sat, 26 Jun 2021 03:09:28 +0900
Subject: [PATCH] =?UTF-8?q?WP=20PLUGIN=E3=80=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

・バグ修正：カスタムフィールドのselected属性の追加漏れ修正
---
 class/class.apop.apop_ui.php     |  2 +-
 util/apop-customfield-select.php | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/class/class.apop.apop_ui.php b/class/class.apop.apop_ui.php
index 80d7321..e23d068 100644
--- a/class/class.apop.apop_ui.php
+++ b/class/class.apop.apop_ui.php
@@ -359,7 +359,7 @@ value="' . esc_html( $sort_num ) . '">
 					name="' . esc_attr( $name_custom_field_type ) . '"
 					value="2"' . esc_attr( self::set_search_normal_checked( $custom_field_type, '2' ) ) . '>追加</label>
 					</div>';
-			self::set_all_customfield_select( $name_meta_key );
+			self::set_all_customfield_select( $name_meta_key, $meta_key );
 			echo '<input type="text" class="custom_field_key" name="' . esc_attr( $name_meta_key ) . '" value="' . esc_attr( $meta_key ) . '" required>
 					</div>
 					<div class="sort-custom-field-inner">
diff --git a/util/apop-customfield-select.php b/util/apop-customfield-select.php
index f62b216..7d5f783 100644
--- a/util/apop-customfield-select.php
+++ b/util/apop-customfield-select.php
@@ -7,12 +7,16 @@ if ( ! trait_exists( 'CUSTOMFIELD_SELECT' ) ) {
 
 	trait CUSTOMFIELD_SELECT {
 
-		public static function set_all_customfield_select( $name_meta_key ) {
+		public static function set_all_customfield_select( $name_meta_key, $meta_key ) {
 			$selects = self::get_all_custom_fields();
-
 			echo '<select class="custom_field_key_select" name="' . esc_attr( $name_meta_key ) . '" required>';
 			foreach ( $selects as $select ) {
-				echo '<option value="' . esc_attr( $select->meta_key ) . '">' . esc_html( $select->meta_key ) . '</option>';
+				if ( $select->meta_key == $meta_key ) {
+					$selected = ' selected';
+				} else {
+					$selected = '';
+				}
+				echo '<option value="' . esc_attr( $select->meta_key ) . '"' . esc_attr( $selected ) . '>' . esc_html( $select->meta_key ) . '</option>';
 			}
 			echo '</select>';
 		}