Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/wp-admin/includes/image.php
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
break;
}
$basename = str_replace( '.', '-', wp_basename( $file ) ) . '-image' . $ext;
$uploaded = wp_upload_bits( $basename, '', $metadata['image']['data'] );
$uploaded = wp_upload_bits( $basename, null, $metadata['image']['data'] );
if ( false === $uploaded['error'] ) {
$image_attachment = array(
'post_mime_type' => $metadata['image']['mime'],
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -1865,7 +1865,7 @@ function upgrade_340() {
if ( 'yes' === $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
$uninstall_plugins = get_option( 'uninstall_plugins' );
delete_option( 'uninstall_plugins' );
add_option( 'uninstall_plugins', $uninstall_plugins, null, false );
add_option( 'uninstall_plugins', $uninstall_plugins, '', false );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/update.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
wp_redirect( admin_url( 'update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce'] ) );
die();
}
iframe_header( __( 'Plugin Reactivation' ), true );
iframe_header( __( 'Plugin Reactivation' ) );
if ( isset( $_GET['success'] ) ) {
echo '<p>' . __( 'Plugin reactivated successfully.' ) . '</p>';
}
Expand Down
5 changes: 0 additions & 5 deletions tests/phpstan/baselines/argument.type.neon
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,6 @@ parameters:
identifier: argument.type
count: 1
path: ../../../src/wp-admin/includes/upgrade.php
-
message: '#^Parameter \#3 \$deprecated of function add_option expects string, null given\.$#'
identifier: argument.type
count: 1
path: ../../../src/wp-admin/includes/upgrade.php
-
message: '#^Parameter \#1 \$bookmark_id of function clean_bookmark_cache expects int, string\|null given\.$#'
identifier: argument.type
Expand Down
2 changes: 1 addition & 1 deletion tests/phpunit/includes/install.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
// Prefill a permalink structure so that WP doesn't try to determine one itself.
add_action( 'populate_options', '_set_default_permalink_structure_for_tests' );

wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, null, 'password' );
wp_install( WP_TESTS_TITLE, 'admin', WP_TESTS_EMAIL, true, '', 'password' );

// Delete dummy permalink structure, as prefilled above.
if ( ! is_multisite() ) {
Expand Down
Loading