Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Grouped Backports to the 4.6 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.6 branch.

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

Built from https://develop.svn.wordpress.org/branches/4.6@57409


git-svn-id: http://core.svn.wordpress.org/branches/4.6@56915 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2024-01-30 15:08:23 +00:00
parent 27b938800e
commit a5a631ecf1
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
wp-admin/includes/class-file-upload-upgrader.php
View File

@ -67,6 +67,30 @@ class File_Upload_Upgrader {
if ( isset( $file['error'] ) )
wp_die( $file['error'] );
if ( 'pluginzip' === $form || 'themezip' === $form ) {
$archive_is_valid = false;
/** This filter is documented in wp-admin/includes/file.php */
if ( class_exists( 'ZipArchive', false ) && apply_filters( 'unzip_file_use_ziparchive', true ) ) {
$archive = new ZipArchive();
$archive_is_valid = $archive->open( $file['file'], ZIPARCHIVE::CHECKCONS );
if ( true === $archive_is_valid ) {
$archive->close();
}
} else {
require_once ABSPATH . 'wp-admin/includes/class-pclzip.php';
$archive = new PclZip( $file['file'] );
$archive_is_valid = is_array( $archive->properties() );
}
if ( true !== $archive_is_valid ) {
wp_delete_file( $file['file'] );
wp_die( __( 'Incompatible Archive.' ) );
}
}
$this->filename = $_FILES[$form]['name'];
$this->package = $file['file'];

5
wp-admin/includes/schema.php
View File

@ -546,10 +546,11 @@ function populate_options() {
else
$autoload = 'yes';
if ( is_array($value) )
$value = serialize($value);
if ( !empty($insert) )
$insert .= ', ';
$value = maybe_serialize( sanitize_option( $option, $value ) );
$insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload );
}

8
wp-admin/update.php
View File

@ -146,6 +146,10 @@ if ( isset($_GET['action']) ) {
check_admin_referer('plugin-upload');
if ( isset( $_FILES['pluginzip']['name'] ) && ! str_ends_with( strtolower( $_FILES['pluginzip']['name'] ), '.zip' ) ) {
wp_die( __( 'Only .zip archives may be uploaded.' ) );
}
$file_upload = new File_Upload_Upgrader('pluginzip', 'package');
$title = __('Upload Plugin');
@ -251,6 +255,10 @@ if ( isset($_GET['action']) ) {
check_admin_referer('theme-upload');
if ( isset( $_FILES['themezip']['name'] ) && ! str_ends_with( strtolower( $_FILES['themezip']['name'] ), '.zip' ) ) {
wp_die( __( 'Only .zip archives may be uploaded.' ) );
}
$file_upload = new File_Upload_Upgrader('themezip', 'package');
wp_enqueue_script( 'customize-loader' );