Merge branch 'master' into release

atanas-dev · atanas-dev · commit b15548b3e136 · 2017-07-17T16:29:05.000+03:00
diff --git a/core/Field/Select_Field.php b/core/Field/Select_Field.php
@@ -20,7 +20,7 @@ public function to_json( $load ) {
 		$values = wp_list_pluck( $options, 'value' );
 		$value = $this->get_formatted_value();
 		if ( ! in_array( $value, $values ) ) {
-			$value = $options[0];
+			$value = $values[0];
 		}
 
 		$field_data = array_merge( $field_data, array(

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function to_json( $load ) {`
`20`	`20`	`$values = wp_list_pluck( $options, 'value' );`
`21`	`21`	`$value = $this->get_formatted_value();`
`22`	`22`	`if ( ! in_array( $value, $values ) ) {`
`23`		`- $value = $options[0];`
	`23`	`+ $value = $values[0];`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`$field_data = array_merge( $field_data, array(`