merge in 1.12.1

tw2113 · tw2113 · commit 7cb4261e9811 · 2022-05-16T11:59:27.000-05:00
diff --git a/inc/wp-cli.php b/inc/wp-cli.php
@@ -57,11 +57,11 @@ public function import( $args, $assoc_args ) {
 		}
 
 		if ( 'post_type' === $this->type ) {
-			$this->data['cptui_post_import'] = $json;
+			$this->data['cptui_post_import'] = json_decode( stripslashes_deep( trim( $json ) ), true );
 		}
 
 		if ( 'taxonomy' === $this->type ) {
-			$this->data['cptui_tax_import'] = $json;
+			$this->data['cptui_tax_import'] = json_decode( stripslashes_deep( trim( $json ) ), true );
 		}
 
 		$result = cptui_import_types_taxes_settings( $this->data );

Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ public function import( $args, $assoc_args ) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if ( 'post_type' === $this->type ) {`
`60`		`- $this->data['cptui_post_import'] = $json;`
	`60`	`+ $this->data['cptui_post_import'] = json_decode( stripslashes_deep( trim( $json ) ), true );`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if ( 'taxonomy' === $this->type ) {`
`64`		`- $this->data['cptui_tax_import'] = $json;`
	`64`	`+ $this->data['cptui_tax_import'] = json_decode( stripslashes_deep( trim( $json ) ), true );`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`$result = cptui_import_types_taxes_settings( $this->data );`