Changeset 57414

Timestamp:

01/30/2024 03:15:17 PM (6 months ago)

Author:

jorbin

Message:

Grouped Backports to the 4.1 branch.

• Install: When populating options, maybe_serialize instead of always serialize.
• Uploads: Check for and verify ZIP archives.

Merges [57388] and [57389] to the 4.1 branch.

Props costdev, peterwilsoncc, azaozz, tykoted, johnbillion, desrosj, afragen, jorbin, xknown.

Location:

branches/4.1

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/update.php (modified) (2 diffs)

branches/4.1/src/wp-admin/includes/class-wp-upgrader.php

@@ -2293 +2293 @@
             if ( isset( $file['error'] ) )
                 wp_die( $file['error'] );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
             $this->filename = $_FILES[$form]['name'];

branches/4.1/src/wp-admin/includes/schema.php

@@ -514 +514 @@
             $autoload = 'yes';
 
-        if ( is_array($value) )
-            $value = serialize($value);
         if ( !empty($insert) )
             $insert .= ', ';
+
+
+
         $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
     }

branches/4.1/src/wp-admin/update.php

@@ -130 +130 @@
         check_admin_referer('plugin-upload');
 
+
+
+
+
         $file_upload = new File_Upload_Upgrader('pluginzip', 'package');
 
@@ -234 +238 @@
 
         check_admin_referer('theme-upload');
+
+
+
+
 
         $file_upload = new File_Upload_Upgrader('themezip', 'package');