Fixed a children attribute bug.

inc2734 · Jan 20, 2015 · 2a23ae2 · 2a23ae2
1 parent 0e92b47
commit 2a23ae2
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 26 deletions.
diff --git a/classes/form-fields/class.checkbox.php b/classes/form-fields/class.checkbox.php
@@ -2,11 +2,11 @@
 /**
  * Name       : MW WP Form Field Checkbox
  * Description: チェックボックスを出力
- * Version    : 1.5.0
+ * Version    : 1.5.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : December 14, 2012
- * Modified   : January 2, 2015
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -74,11 +74,12 @@ protected function input_page() {
 	 * @return string HTML
 	 */
 	protected function confirm_page() {
-		$children = $this->get_children( $this->atts['children'] );
-		$value = $this->Form->get_checked_value( $this->atts['name'], $children );
-		$_ret  = esc_html( $value );
-		$_ret .= $this->Form->hidden( $this->atts['name'] . '[data]', $value );
-		$_ret .= $this->Form->separator( $this->atts['name'] );
+		$children     = $this->get_children( $this->atts['children'] );
+		$value        = $this->Form->get_checked_value( $this->atts['name'], $children );
+		$posted_value = $this->Form->get_raw( $this->atts['name'] );
+		$_ret         = esc_html( $value );
+		$_ret        .= $this->Form->hidden( $this->atts['name'] . '[data]', $posted_value );
+		$_ret        .= $this->Form->separator( $this->atts['name'] );
 		return $_ret;
 	}
 

diff --git a/classes/form-fields/class.radio.php b/classes/form-fields/class.radio.php
@@ -2,11 +2,11 @@
 /**
  * Name       : MW WP Form Field Radio
  * Description: ラジオボタンを出力
- * Version    : 1.5.0
+ * Version    : 1.5.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : December 14, 2012
- * Modified   : January 2, 2015
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -71,10 +71,11 @@ protected function input_page() {
 	 * @return string HTML
 	 */
 	protected function confirm_page() {
-		$children = $this->get_children( $this->atts['children'] );
-		$value = $this->Form->get_radio_value( $this->atts['name'], $children );
-		$_ret  = esc_html( $value );
-		$_ret .= $this->Form->hidden( $this->atts['name'], $value );
+		$children     = $this->get_children( $this->atts['children'] );
+		$value        = $this->Form->get_radio_value( $this->atts['name'], $children );
+		$posted_value = $this->Form->get_raw( $this->atts['name'] );
+		$_ret         = esc_html( $value );
+		$_ret        .= $this->Form->hidden( $this->atts['name'], $posted_value );
 		return $_ret;
 	}
 

diff --git a/classes/form-fields/class.select.php b/classes/form-fields/class.select.php
@@ -2,11 +2,11 @@
 /**
  * Name       : MW WP Form Field Select
  * Description: セレクトボックスを出力
- * Version    : 1.5.0
+ * Version    : 1.5.1
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : December 14, 2012
- * Modified   : January 2, 2015
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -69,10 +69,11 @@ protected function input_page() {
 	 * @return string HTML
 	 */
 	protected function confirm_page() {
-		$children = $this->get_children( $this->atts['children'] );
-		$value = $this->Form->get_selected_value( $this->atts['name'], $children );
-		$_ret  = esc_html( $value );
-		$_ret .= $this->Form->hidden( $this->atts['name'], $value );
+		$children     = $this->get_children( $this->atts['children'] );
+		$value        = $this->Form->get_selected_value( $this->atts['name'], $children );
+		$posted_value = $this->Form->get_raw( $this->atts['name'] );
+		$_ret         = esc_html( $value );
+		$_ret        .= $this->Form->hidden( $this->atts['name'], $posted_value );
 		return $_ret;
 	}
 

diff --git a/classes/models/class.data.php b/classes/models/class.data.php
@@ -2,11 +2,11 @@
 /**
  * Name       : MW WP Form Data
  * Description: MW WP Form のデータ操作用
- * Version    : 1.3.1
+ * Version    : 1.3.2
  * Author     : Takashi Kitajima
  * Author URI : http://2inc.org
  * Created    : October 10, 2013
- * Modified   : January 14, 2015
+ * Modified   : January 20, 2015
  * License    : GPLv2
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
  */
@@ -331,19 +331,19 @@ public function getSeparatorValue( $key ) {
 	 */
 	public function get_separated_value( $key, array $children = array() ) {
 		$separator = $this->get_separator_value( $key );
-		$value = $this->get_raw( $key );
+		$value     = $this->get_raw( $key );
 		if ( is_array( $value ) && isset( $value['data'] ) && is_array( $value['data'] ) && !empty( $separator ) ) {
 			if ( $children ) {
 				$rightData = array();
-				foreach ( $value['data'] as $child ) {
-					if ( isset( $children[$child] ) && !in_array( $children[$child], $rightData ) ) {
-						$rightData[] = $children[$child];
+				foreach ( $value['data'] as $name => $child ) {
+					if ( isset( $children[$name] ) && !in_array( $children[$name], $rightData ) ) {
+						$rightData[] = $children[$name];
 					}
 				}
 				return implode( $separator, $rightData );
 			} else {
 				// すべて空のからのときはimplodeしないように（---がいってしまうため）
-				foreach ( $value['data'] as $child ) {
+				foreach ( $value['data'] as $name => $child ) {
 					if ( $child !== '' && $child !== null ) {
 						return implode( $separator, $value['data'] );
 					}