CMB2_Option::get_options should cast CMB2_Option::$options to array, …

…not just the return. Fixes CMB2#993
del4y · Jul 7, 2017 · ed2e58f · ed2e58f
1 parent 0ef40fd
commit ed2e58f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/includes/CMB2_Options.php b/includes/CMB2_Options.php
@@ -207,7 +207,9 @@ public function get_options( $default = null ) {
 			}
 		}
 
-		return (array) $this->options;
+		$this->options = (array) $this->options;
+
+		return $this->options;
 	}
 
 }
diff --git a/tests/test-cmb-options.php b/tests/test-cmb-options.php
@@ -83,6 +83,17 @@ public function test_cmb2_get_option_bad_value() {
 		$opts->set( $this->opt_set );
 	}
 
+	public function test_cmb2_remove_option_bad_value() {
+		$opts = cmb2_options( $this->options_cmb->cmb_id );
+		$opts->delete_option();
+
+		$val = $opts->remove( 'my_name' );
+
+		$this->assertSame( array(), $val );
+
+		$opts->set( $this->opt_set );
+	}
+
 	public function test_cmb2_update_option() {
 		$new_value = 'James';