Merge pull request #252 from Automattic/fix/wcpay-features

dereksmart · web-flow · commit 6bb1107afed4 · 2022-02-16T08:34:05.000-05:00
Only load WCPay features when requested
diff --git a/features/woocommerce-payments.php b/features/woocommerce-payments.php
@@ -50,16 +50,18 @@ function ( $defaults ) {
 			'jurassic_ninja_rest_create_request_features',
 			function ( $features, $json_params ) {
 				if ( isset( $json_params['woocommerce-payments-dev-tools'] ) ) {
-					$features['woocommerce-payments-dev-tools'] = true;
+					$features['woocommerce-payments-dev-tools'] = $json_params['woocommerce-payments-dev-tools'];
 				}
 
 				if ( isset( $json_params['woocommerce-payments-jn-options'] ) ) {
-					$features['woocommerce-payments-jn-options'] = true;
+					$features['woocommerce-payments-jn-options'] = $json_params['woocommerce-payments-jn-options'];
 				}
 
 				if ( isset( $json_params['woocommerce-payments-release'] ) ) {
 					$features['woocommerce-payments-release'] = $json_params['woocommerce-payments-release'];
-					$features['woocommerce'] = true;
+					if ( $features['woocommerce-payments-release'] ) {
+						$features['woocommerce'] = true;
+					}
 				}
 
 				return $features;

Original file line number	Diff line number	Diff line change
`@@ -50,16 +50,18 @@ function ( $defaults ) {`
`50`	`50`	`'jurassic_ninja_rest_create_request_features',`
`51`	`51`	`function ( $features, $json_params ) {`
`52`	`52`	`if ( isset( $json_params['woocommerce-payments-dev-tools'] ) ) {`
`53`		`- $features['woocommerce-payments-dev-tools'] = true;`
	`53`	`+ $features['woocommerce-payments-dev-tools'] = $json_params['woocommerce-payments-dev-tools'];`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if ( isset( $json_params['woocommerce-payments-jn-options'] ) ) {`
`57`		`- $features['woocommerce-payments-jn-options'] = true;`
	`57`	`+ $features['woocommerce-payments-jn-options'] = $json_params['woocommerce-payments-jn-options'];`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`if ( isset( $json_params['woocommerce-payments-release'] ) ) {`
`61`	`61`	`$features['woocommerce-payments-release'] = $json_params['woocommerce-payments-release'];`
`62`		`- $features['woocommerce'] = true;`
	`62`	`+ if ( $features['woocommerce-payments-release'] ) {`
	`63`	`+ $features['woocommerce'] = true;`
	`64`	`+ }`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`return $features;`