Merge remote-tracking branch 'origin/feat/sdk32' into feat/sdk32

selul · selul · commit fc94be46a5f6 · 2020-02-28T16:04:48.000+02:00
diff --git a/src/Modules/Licenser.php b/src/Modules/Licenser.php
@@ -791,13 +791,14 @@ public function load( $product ) {
 			$this->register_license_hooks();
 		}
 
-		if ( defined( 'WP_CLI' ) && WP_CLI ) {
-			$namespace = apply_filters( 'themesle_sdk_cli_' . md5( $product->get_basefile() ), false );
-			if ( false !== $namespace ) {
+		$namespace = apply_filters( 'themesle_sdk_namespace_' . md5( $product->get_basefile() ), false );
+
+		if ( false !== $namespace ) {
+			add_filter( 'themeisle_sdk_license_process_' . $namespace, [ $this, 'process_license' ], 10, 2 );
+			if ( defined( 'WP_CLI' ) && WP_CLI ) {
 				\WP_CLI::add_command( $namespace . ' activate', [ $this, 'cli_activate' ] );
 				\WP_CLI::add_command( $namespace . ' deactivate', [ $this, 'cli_deactivate' ] );
 				\WP_CLI::add_command( $namespace . ' is-active', [ $this, 'cli_is_active' ] );
-				add_filter( 'themeisle_sdk_license_process_' . $namespace, [ $this, 'process_license' ], 10, 2 );
 			}
 		}
 
@@ -850,7 +851,7 @@ public function auto_activate() {
 		}
 
 		require_once( ABSPATH . '/wp-admin/includes/file.php' );
-		WP_Filesystem();
+		\WP_Filesystem();
 		$content = json_decode( $wp_filesystem->get_contents( $license_file ) );
 		if ( ! is_object( $content ) ) {
 			return;

Original file line number	Diff line number	Diff line change
`@@ -791,13 +791,14 @@ public function load( $product ) {`
`791`	`791`	`$this->register_license_hooks();`
`792`	`792`	`}`
`793`	`793`
`794`		`- if ( defined( 'WP_CLI' ) && WP_CLI ) {`
`795`		`- $namespace = apply_filters( 'themesle_sdk_cli_' . md5( $product->get_basefile() ), false );`
`796`		`- if ( false !== $namespace ) {`
	`794`	`+ $namespace = apply_filters( 'themesle_sdk_namespace_' . md5( $product->get_basefile() ), false );`
	`795`	`+`
	`796`	`+ if ( false !== $namespace ) {`
	`797`	`+ add_filter( 'themeisle_sdk_license_process_' . $namespace, [ $this, 'process_license' ], 10, 2 );`
	`798`	`+ if ( defined( 'WP_CLI' ) && WP_CLI ) {`
`797`	`799`	`\WP_CLI::add_command( $namespace . ' activate', [ $this, 'cli_activate' ] );`
`798`	`800`	`\WP_CLI::add_command( $namespace . ' deactivate', [ $this, 'cli_deactivate' ] );`
`799`	`801`	`\WP_CLI::add_command( $namespace . ' is-active', [ $this, 'cli_is_active' ] );`
`800`		`- add_filter( 'themeisle_sdk_license_process_' . $namespace, [ $this, 'process_license' ], 10, 2 );`
`801`	`802`	`}`
`802`	`803`	`}`
`803`	`804`
`@@ -850,7 +851,7 @@ public function auto_activate() {`
`850`	`851`	`}`
`851`	`852`
`852`	`853`	`require_once( ABSPATH . '/wp-admin/includes/file.php' );`
`853`		`- WP_Filesystem();`
	`854`	`+ \WP_Filesystem();`
`854`	`855`	`$content = json_decode( $wp_filesystem->get_contents( $license_file ) );`
`855`	`856`	`if ( ! is_object( $content ) ) {`
`856`	`857`	`return;`