Changeset 3012235

Timestamp:

12/20/2023 01:16:59 AM (2 years ago)

Author:

britner

Message:

1.2.23

Location:

kadence-starter-templates/trunk

Files:

• class-kadence-starter-templates.php (modified) (3 diffs)
• inc/class-template-database-importer.php (modified) (1 diff)
• kadence-starter-templates.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

kadence-starter-templates/trunk/class-kadence-starter-templates.php

@@ -198 +198 @@
         }
         if ( ! defined( 'KADENCE_STARTER_TEMPLATES_VERSION' ) ) {
-            define( 'KADENCE_STARTER_TEMPLATES_VERSION', '1.2.21' );
+            define( 'KADENCE_STARTER_TEMPLATES_VERSION', '1.2.23' );
         }
     }
@@ -1034 +1034 @@
             $has_content = ( 0 < wp_count_posts( 'attachment' )->inherit ? true : false );
         }
+        $current_user     = wp_get_current_user();
+        $user_email       = $current_user->user_email;
         if ( class_exists( 'Kadence_Theme_Pro' ) ) {
-            if ( is_multisite() && ! apply_filters( 'kadence_activation_individual_multisites', false ) ) {
-                $pro_data = get_site_option( 'ktp_api_manager' );
-            } else {
-                $pro_data = get_option( 'ktp_api_manager' );
+            $pro_data = array();
+            if ( function_exists( '\KadenceWP\KadencePro\StellarWP\Uplink\get_license_key' ) ) {
+                $pro_data['ktp_api_key'] = \KadenceWP\KadencePro\StellarWP\Uplink\get_license_key( 'kadence-theme-pro' );
+                $pro_data['activation_email'] = $current_user->user_email;
+            }
+            if ( empty( $pro_data ) ) {
+                if ( is_multisite() && ! apply_filters( 'kadence_activation_individual_multisites', false ) ) {
+                    $pro_data = get_site_option( 'ktp_api_manager' );
+                } else {
+                    $pro_data = get_option( 'ktp_api_manager' );
+                }
             }
         } else {
@@ -1044 +1053 @@
         }
         $show_builder_choice = ( 'active' === $plugins['elementor']['state'] ? true : false );
-        $current_user     = wp_get_current_user();
-        $user_email       = $current_user->user_email;
         $subscribed       = ( class_exists( 'Kadence_Theme_Pro' ) || ! empty( apply_filters( 'kadence_starter_templates_custom_array', array() ) ) ? true : get_option( 'kadence_starter_templates_subscribe' ) );
         wp_enqueue_style( 'kadence-starter-templates', KADENCE_STARTER_TEMPLATES_URL . 'assets/css/starter-templates.css', array( 'wp-components' ), KADENCE_STARTER_TEMPLATES_VERSION );

kadence-starter-templates/trunk/inc/class-template-database-importer.php

@@ -301 +301 @@
         $ktp_api = 'free';
         if ( class_exists( 'Kadence_Theme_Pro' ) ) {
-            $ktp_data = get_option( 'ktp_api_manager' );
-            if ( $ktp_data && isset( $ktp_data['ktp_api_key'] ) && ! empty( $ktp_data['ktp_api_key'] ) ) {
-                $ktp_api = $ktp_data['ktp_api_key'];
-            } else if ( $ktp_data && isset( $ktp_data['ithemes_key'] ) && ! empty( $ktp_data['ithemes_key'] ) ) {
-                $ktp_api = $ktp_data['ithemes_key'];
+            $pro_data = array();
+            if ( function_exists( '\KadenceWP\KadencePro\StellarWP\Uplink\get_license_key' ) ) {
+                $pro_data['ktp_api_key'] = \KadenceWP\KadencePro\StellarWP\Uplink\get_license_key( 'kadence-theme-pro' );
+                $pro_data['activation_email'] = $current_user->user_email;
+            }
+            if ( empty( $pro_data ) ) {
+                if ( is_multisite() && ! apply_filters( 'kadence_activation_individual_multisites', false ) ) {
+                    $pro_data = get_site_option( 'ktp_api_manager' );
+                } else {
+                    $pro_data = get_option( 'ktp_api_manager' );
+                }
+            }
+            if ( $pro_data && isset( $pro_data['ktp_api_key'] ) && ! empty( $pro_data['ktp_api_key'] ) ) {
+                $ktp_api = $pro_data['ktp_api_key'];
+            } else if ( $pro_data && isset( $pro_data['ithemes_key'] ) && ! empty( $pro_data['ithemes_key'] ) ) {
+                $ktp_api = $pro_data['ithemes_key'];
             }
         }

kadence-starter-templates/trunk/kadence-starter-templates.php

@@ -3 +3 @@
  * Plugin Name: Kadence Starter Templates
  * Description: Choose the prebuilt website and click to import.
- * Version: 1.2.22
+ * Version: 1.2.23
  * Author: Kadence WP
  * Author URI: https://kadencewp.com/

kadence-starter-templates/trunk/readme.txt

@@ -3 +3 @@
 Tags: templates, gutenberg
 Requires at least: 5.6
-Tested up to: 6.3
-Stable tag: 1.2.22
+Tested up to: 6.4
+Stable tag: 1.2.23
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -127 +127 @@
 == Changelog ==
 
+= 1.2.23 =
+* Fix: Issue with Pro site imports.
+
 = 1.2.22 =
 * Add: Import webp images support.