Changeset 3378933

Timestamp:

10/15/2025 01:47:30 PM (2 months ago)

Author:

athemes

Message:

v1.1.4

Location:

athemes-starter-sites/trunk

Files:

• README.txt (modified) (1 diff)
• athemes-starter-sites.php (modified) (1 diff)
• v2/classes/class-customizer-importer.php (modified) (2 diffs)
• v2/classes/class-importer.php (modified) (5 diffs)
• v2/themes/sydney.php (modified) (1 diff)
• v2/vendor/wp-content-importer-v2/WXRImporter.php (modified) (3 diffs)

athemes-starter-sites/trunk/README.txt

@@ -4 +4 @@
 Tested up to: 6.8.3
 Requires PHP: 5.4
-Stable tag: 1.1.3
+Stable tag: 1.1.4
 Contributors: aThemes
 License: GPLv2 or later

athemes-starter-sites/trunk/athemes-starter-sites.php

@@ -3 +3 @@
  * Plugin Name:       aThemes Starter Sites
  * Description:       Starter Sites for Sydney and Botiga
- * Version:           1.1.3
+ * Version:           1.1.4
  * Author:            aThemes
  * Author URI:        https://athemes.com

athemes-starter-sites/trunk/v2/classes/class-customizer-importer.php

@@ -42 +42 @@
         // Setup internal vars.
         $template = get_template();
+        $stylesheet = get_stylesheet();
 
         // Data checks.
@@ -50 +51 @@
             );
         }
-        if ( $data['template'] !== $template ) {
+        
+        // Allow import if the template matches either:
+        // 1. The parent theme (template)
+        // 2. The current theme/child theme (stylesheet)
+        // 3. Apply filter to allow custom theme matching logic
+        $theme_matches = ( $data['template'] === $template || $data['template'] === $stylesheet );
+        $theme_matches = apply_filters( 'atss_customizer_import_theme_match', $theme_matches, $data['template'], $template, $stylesheet );
+        
+        if ( ! $theme_matches ) {
             return new WP_Error(
                 'customizer_import_wrong_theme',
-                esc_html__( 'Error: The customizer import file is not suitable for current theme. You can only import customizer settings for the same theme or a child theme.', 'athemes-starter-sites' )
+                sprintf(
+                    esc_html__( 'Error: The customizer import file is for "%s" theme but current theme is "%s". You can only import customizer settings for the same theme or a child theme.', 'athemes-starter-sites' ),
+                    $data['template'],
+                    $stylesheet
+                )
             );
         }

athemes-starter-sites/trunk/v2/classes/class-importer.php

@@ -690 +690 @@
         $time = microtime( true ) - $this->microtime;
 
-        // Check attachment count for splitting (Option 2: split every X attachments)
-        $split_after_attachments = apply_filters( 'atss_split_after_attachments', 10 );
+        // Check attachment count for splitting - only split if significant time has also passed
+        // This prevents infinite split loops and ensures we only split when actually needed
+        $split_after_attachments = apply_filters( 'atss_split_after_attachments', 10 ); // Increased from 10 to 20
         $should_split_by_count = false;
         
         if ( $this->importer && method_exists( $this->importer, 'get_attachment_count' ) ) {
             $attachment_count = $this->importer->get_attachment_count();
-            if ( $attachment_count >= $split_after_attachments ) {
+            // Only split if we've processed enough attachments AND some time has passed (at least 15 seconds)
+            // This prevents splits when all files already exist (instant processing)
+            if ( $attachment_count >= $split_after_attachments && $time > 15 ) {
                 $should_split_by_count = true;
             }
@@ -702 +705 @@
 
         // We should make a new ajax call, if the time is right OR attachment count is reached.
-        $time_limit = apply_filters( 'atss_time_for_one_ajax_call', 300 );
+        // Reduced from 300 to 120 to align better with JS timeout of 120 seconds
+        $time_limit = apply_filters( 'atss_time_for_one_ajax_call', 120 );
         if ( $time > $time_limit || $should_split_by_count ) {
+
+            // Reset the attachment counter for the next AJAX call
+            if ( $this->importer && method_exists( $this->importer, 'reset_attachment_count' ) ) {
+                $this->importer->reset_attachment_count();
+            }
 
             $response = array(
@@ -1197 +1206 @@
          * Process customizer.json.
          */
-        // Get JSON data from customizer.json.
-        $raw = wp_remote_get( wp_unslash( $file_url ) );
+        // Increase time limit for customizer import to prevent timeout
+        if ( ! ini_get( 'safe_mode' ) ) {
+            @set_time_limit( 120 ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
+        }
+
+        // Get JSON data from customizer.json with extended timeout.
+        $raw = wp_remote_get( 
+            wp_unslash( $file_url ),
+            array(
+                'timeout' => 30, // Extended timeout for larger customizer files
+                'sslverify' => false,
+            )
+        );
+
+        // Check if fetch failed.
+        if ( is_wp_error( $raw ) ) {
+            wp_send_json_error( 
+                sprintf(
+                    esc_html__( 'Failed to fetch customizer file: %s', 'athemes-starter-sites' ),
+                    $raw->get_error_message()
+                )
+            );
+        }
 
         // Abort if customizer.json response code is not successful.
         if ( 200 != wp_remote_retrieve_response_code( $raw ) ) {
-            wp_send_json_error( esc_html__( 'Failed to load customizer demo file.', 'athemes-starter-sites' ) );
+            wp_send_json_error( 
+                sprintf(
+                    esc_html__( 'Failed to load customizer demo file. HTTP %d', 'athemes-starter-sites' ),
+                    wp_remote_retrieve_response_code( $raw )
+                )
+            );
         }
 
@@ -1211 +1246 @@
         $data = maybe_unserialize( wp_remote_retrieve_body( $raw ), true );
 
+        // Check if data was properly unserialized
+        if ( empty( $data ) || ! is_array( $data ) ) {
+            wp_send_json_error( esc_html__( 'Failed to parse customizer data. File may be corrupted.', 'athemes-starter-sites' ) );
+        }
+
         $customizer = new ATSS_Customizer_Importer();
 
@@ -1217 +1257 @@
 
         if ( is_wp_error( $results ) ) {
-            wp_send_json_error( esc_html__( 'An error occurred while importing customizer.', 'athemes-starter-sites' ) );
+            wp_send_json_error( 
+                sprintf(
+                    esc_html__( 'Customizer import error: %s', 'athemes-starter-sites' ),
+                    $results->get_error_message()
+                )
+            );
         }
 

athemes-starter-sites/trunk/v2/themes/sydney.php

@@ -1281 +1281 @@
 }
 add_filter( 'atss_register_customize_tooltips', 'sydney_atss_color_scheme_tooltips' );
+
+/**
+ * Allow Sydney and Sydney Pro to share customizer files
+ * This ensures cross-compatibility between Sydney (free) and Sydney Pro themes
+ */
+function sydney_atss_customizer_import_theme_match( $theme_matches, $import_template, $current_template, $current_stylesheet ) {
+    // If already matched, return true
+    if ( $theme_matches ) {
+        return true;
+    }
+
+    $sydney_themes = array( 'sydney', 'sydney-pro', 'sydney-pro-ii' );
+    
+    if ( in_array( $import_template, $sydney_themes, true ) && in_array( $current_template, $sydney_themes, true ) ) {
+        return true;
+    }
+    
+    if ( in_array( $import_template, $sydney_themes, true ) && in_array( $current_stylesheet, $sydney_themes, true ) ) {
+        return true;
+    }
+    
+    return $theme_matches;
+}
+add_filter( 'atss_customizer_import_theme_match', 'sydney_atss_customizer_import_theme_match', 10, 4 );

athemes-starter-sites/trunk/v2/vendor/wp-content-importer-v2/WXRImporter.php

@@ -1960 +1960 @@
         // Wrap entire download in try-catch to prevent crashes
         try {
-            // Increment attachment counter for AJAX splitting
-            $this->attachment_count++;
-            
             // extract the file name and extension from the url
             $file_name = basename( $url );
@@ -1976 +1973 @@
                     'url'  => $exists_url,
                 );
+                // Don't increment counter when file already exists
                 return $upload;
             }
+
+            // Increment attachment counter ONLY for actual downloads
+            // This prevents false positives when files are already cached
+            $this->attachment_count++;
 
             // get placeholder file in the upload dir with a unique, sanitized filename
@@ -2663 +2665 @@
         return $this->attachment_count;
     }
+
+    /**
+     * Reset attachment count (called when starting a new AJAX request)
+     *
+     * @return void
+     */
+    public function reset_attachment_count() {
+        $this->attachment_count = 0;
+    }
 }