Changeset 2895819

Timestamp:

04/08/2023 03:07:41 AM (3 years ago)

Author:

supportcandy

Message:

form fields not loading after v3.1.5 hotfix

Location:

supportcandy

Files:

• tags/3.1.5/includes/class-wpsc-sc-upgrade.php (modified) (4 diffs)
• trunk/includes/class-wpsc-sc-upgrade.php (modified) (4 diffs)

supportcandy/tags/3.1.5/includes/class-wpsc-sc-upgrade.php

@@ -158 +158 @@
             );
 
-            if ( $customers['total_items'] ) {
+            if ( $customers['results'] ) {
 
                 foreach ( $customers['results'] as $customer ) {
@@ -173 +173 @@
                     update_user_meta( $customer->user->ID, get_current_blog_id() . '-wpsc-tl-saved-filters', $saved_filters );
                 }
+            } else {
+
+                WPSC_Scheduled_Task::destroy( $task );
+                delete_transient( 'wpsc_upgrade_saved_filter_conditions_cursor' );
             }
 
@@ -197 +201 @@
         public static function upgrade_condition( $conditions, $relation ) {
 
+            if ( ! $conditions || $conditions == '[]' ) {
+                return '[]';
+            }
+
             $conditions = json_decode( html_entity_decode( $conditions ), true );
+            $slug_arr = array_keys( $conditions );
+            if ( is_numeric( $slug_arr[0] ) ) {
+                return wp_json_encode( $conditions );
+            }
+
             $and_conditions = array();
             $or_conditions = array();
+
             foreach ( $conditions as $slug => $condition ) {
                 if ( preg_match( '/^cf_\w+$/', $slug ) ) {
@@ -211 +225 @@
                 }
             }
+
             if ( $relation == 'OR' ) {
                 $and_conditions[] = $or_conditions;
             }
+
             return wp_json_encode( $and_conditions );
         }

supportcandy/trunk/includes/class-wpsc-sc-upgrade.php

@@ -158 +158 @@
             );
 
-            if ( $customers['total_items'] ) {
+            if ( $customers['results'] ) {
 
                 foreach ( $customers['results'] as $customer ) {
@@ -173 +173 @@
                     update_user_meta( $customer->user->ID, get_current_blog_id() . '-wpsc-tl-saved-filters', $saved_filters );
                 }
+            } else {
+
+                WPSC_Scheduled_Task::destroy( $task );
+                delete_transient( 'wpsc_upgrade_saved_filter_conditions_cursor' );
             }
 
@@ -197 +201 @@
         public static function upgrade_condition( $conditions, $relation ) {
 
+            if ( ! $conditions || $conditions == '[]' ) {
+                return '[]';
+            }
+
             $conditions = json_decode( html_entity_decode( $conditions ), true );
+            $slug_arr = array_keys( $conditions );
+            if ( is_numeric( $slug_arr[0] ) ) {
+                return wp_json_encode( $conditions );
+            }
+
             $and_conditions = array();
             $or_conditions = array();
+
             foreach ( $conditions as $slug => $condition ) {
                 if ( preg_match( '/^cf_\w+$/', $slug ) ) {
@@ -211 +225 @@
                 }
             }
+
             if ( $relation == 'OR' ) {
                 $and_conditions[] = $or_conditions;
             }
+
             return wp_json_encode( $and_conditions );
         }