- ; ?>)
+
diff --git a/src/wp-admin/includes/class-file-upload-upgrader.php b/src/wp-admin/includes/class-file-upload-upgrader.php
index 2b76e41ea61d1..1201c6d188920 100644
--- a/src/wp-admin/includes/class-file-upload-upgrader.php
+++ b/src/wp-admin/includes/class-file-upload-upgrader.php
@@ -69,6 +69,13 @@ public function __construct( $form, $urlholder ) {
wp_die( $file['error'] );
}
+ if ( 'pluginzip' === $form || 'themezip' === $form ) {
+ if ( ! wp_zip_file_is_valid( $file['file'] ) ) {
+ wp_delete_file( $file['file'] );
+ wp_die( __( 'Incompatible Archive.' ) );
+ }
+ }
+
$this->filename = $_FILES[ $form ]['name'];
$this->package = $file['file'];
diff --git a/src/wp-admin/includes/class-language-pack-upgrader.php b/src/wp-admin/includes/class-language-pack-upgrader.php
index 3c3d42a56a9c8..855dbe642ad25 100644
--- a/src/wp-admin/includes/class-language-pack-upgrader.php
+++ b/src/wp-admin/includes/class-language-pack-upgrader.php
@@ -409,12 +409,16 @@ public function clear_destination( $remote_destination ) {
$files = array(
$remote_destination . $language_update->language . '.po',
$remote_destination . $language_update->language . '.mo',
+ $remote_destination . $language_update->language . '.l10n.php',
$remote_destination . 'admin-' . $language_update->language . '.po',
$remote_destination . 'admin-' . $language_update->language . '.mo',
+ $remote_destination . 'admin-' . $language_update->language . '.l10n.php',
$remote_destination . 'admin-network-' . $language_update->language . '.po',
$remote_destination . 'admin-network-' . $language_update->language . '.mo',
+ $remote_destination . 'admin-network-' . $language_update->language . '.l10n.php',
$remote_destination . 'continents-cities-' . $language_update->language . '.po',
$remote_destination . 'continents-cities-' . $language_update->language . '.mo',
+ $remote_destination . 'continents-cities-' . $language_update->language . '.l10n.php',
);
$json_translation_files = glob( $language_directory . $language_update->language . '-*.json' );
@@ -427,6 +431,7 @@ public function clear_destination( $remote_destination ) {
$files = array(
$remote_destination . $language_update->slug . '-' . $language_update->language . '.po',
$remote_destination . $language_update->slug . '-' . $language_update->language . '.mo',
+ $remote_destination . $language_update->slug . '-' . $language_update->language . '.l10n.php',
);
$language_directory = $language_directory . $language_update->type . 's/';
diff --git a/src/wp-admin/includes/class-plugin-upgrader.php b/src/wp-admin/includes/class-plugin-upgrader.php
index 091cfebc188ff..97343fcf9ded8 100644
--- a/src/wp-admin/includes/class-plugin-upgrader.php
+++ b/src/wp-admin/includes/class-plugin-upgrader.php
@@ -155,6 +155,12 @@ public function install( $package, $args = array() ) {
// Force refresh of plugin update information.
wp_clean_plugins_cache( $parsed_args['clear_update_cache'] );
+ $all_plugin_data = get_option( 'plugin_data', array() );
+ $plugin_file = $this->new_plugin_data['file'];
+ unset( $this->new_plugin_data['file'] );
+ $all_plugin_data[ $plugin_file ] = $this->new_plugin_data;
+ update_option( 'plugin_data', $all_plugin_data );
+
if ( $parsed_args['overwrite_package'] ) {
/**
* Fires when the upgrader has successfully overwritten a currently installed
@@ -482,7 +488,16 @@ public function check_package( $source ) {
foreach ( $files as $file ) {
$info = get_plugin_data( $file, false, false );
if ( ! empty( $info['Name'] ) ) {
- $this->new_plugin_data = $info;
+ $basename = basename( $file );
+ $dirname = basename( dirname( $file ) );
+
+ if ( '.' === $dirname ) {
+ $plugin_file = $basename;
+ } else {
+ $plugin_file = "$dirname/$basename";
+ }
+ $this->new_plugin_data = ( $info );
+ $this->new_plugin_data['file'] = $plugin_file;
break;
}
}
diff --git a/src/wp-admin/includes/class-wp-plugin-install-list-table.php b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
index 7823f00b70996..132af29452ec2 100644
--- a/src/wp-admin/includes/class-wp-plugin-install-list-table.php
+++ b/src/wp-admin/includes/class-wp-plugin-install-list-table.php
@@ -525,6 +525,8 @@ public function display_rows() {
// Remove any HTML from the description.
$description = strip_tags( $plugin['short_description'] );
+ $description .= $this->get_dependencies_notice( $plugin );
+
/**
* Filters the plugin card description on the Add Plugins screen.
*
@@ -555,102 +557,7 @@ public function display_rows() {
$action_links = array();
- if ( current_user_can( 'install_plugins' ) || current_user_can( 'update_plugins' ) ) {
- $status = install_plugin_install_status( $plugin );
-
- switch ( $status['status'] ) {
- case 'install':
- if ( $status['url'] ) {
- if ( $compatible_php && $compatible_wp ) {
- $action_links[] = sprintf(
- '%s',
- esc_attr( $plugin['slug'] ),
- esc_url( $status['url'] ),
- /* translators: %s: Plugin name and version. */
- esc_attr( sprintf( _x( 'Install %s now', 'plugin' ), $name ) ),
- esc_attr( $name ),
- __( 'Install Now' )
- );
- } else {
- $action_links[] = sprintf(
- '',
- _x( 'Cannot Install', 'plugin' )
- );
- }
- }
- break;
-
- case 'update_available':
- if ( $status['url'] ) {
- if ( $compatible_php && $compatible_wp ) {
- $action_links[] = sprintf(
- '%s',
- esc_attr( $status['file'] ),
- esc_attr( $plugin['slug'] ),
- esc_url( $status['url'] ),
- /* translators: %s: Plugin name and version. */
- esc_attr( sprintf( _x( 'Update %s now', 'plugin' ), $name ) ),
- esc_attr( $name ),
- __( 'Update Now' )
- );
- } else {
- $action_links[] = sprintf(
- '',
- _x( 'Cannot Update', 'plugin' )
- );
- }
- }
- break;
-
- case 'latest_installed':
- case 'newer_installed':
- if ( is_plugin_active( $status['file'] ) ) {
- $action_links[] = sprintf(
- '',
- _x( 'Active', 'plugin' )
- );
- } elseif ( current_user_can( 'activate_plugin', $status['file'] ) ) {
- if ( $compatible_php && $compatible_wp ) {
- $button_text = __( 'Activate' );
- /* translators: %s: Plugin name. */
- $button_label = _x( 'Activate %s', 'plugin' );
- $activate_url = add_query_arg(
- array(
- '_wpnonce' => wp_create_nonce( 'activate-plugin_' . $status['file'] ),
- 'action' => 'activate',
- 'plugin' => $status['file'],
- ),
- network_admin_url( 'plugins.php' )
- );
-
- if ( is_network_admin() ) {
- $button_text = __( 'Network Activate' );
- /* translators: %s: Plugin name. */
- $button_label = _x( 'Network Activate %s', 'plugin' );
- $activate_url = add_query_arg( array( 'networkwide' => 1 ), $activate_url );
- }
-
- $action_links[] = sprintf(
- '%3$s',
- esc_url( $activate_url ),
- esc_attr( sprintf( $button_label, $plugin['name'] ) ),
- $button_text
- );
- } else {
- $action_links[] = sprintf(
- '',
- _x( 'Cannot Activate', 'plugin' )
- );
- }
- } else {
- $action_links[] = sprintf(
- '',
- _x( 'Installed', 'plugin' )
- );
- }
- break;
- }
- }
+ $action_links[] = wp_get_plugin_action_button( $name, $plugin, $compatible_php, $compatible_wp );
$details_link = self_admin_url(
'plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
@@ -828,4 +735,90 @@ public function display_rows() {
echo '';
}
}
+
+ /**
+ * Returns a notice containing a list of dependencies required by the plugin.
+ *
+ * @since 6.5.0
+ *
+ * @param array $plugin_data An array of plugin data. See {@see plugins_api()}
+ * for the list of possible values.
+ * @return string A notice containing a list of dependencies required by the plugin,
+ * or an empty string if none is required.
+ */
+ protected function get_dependencies_notice( $plugin_data ) {
+ if ( empty( $plugin_data['requires_plugins'] ) ) {
+ return '';
+ }
+
+ $no_name_markup = '%s
';
+ $has_name_markup = '%s %s
';
+
+ $dependencies_list = '';
+ foreach ( $plugin_data['requires_plugins'] as $dependency ) {
+ $dependency_data = WP_Plugin_Dependencies::get_dependency_data( $dependency );
+
+ if (
+ false !== $dependency_data &&
+ ! empty( $dependency_data['name'] ) &&
+ ! empty( $dependency_data['slug'] ) &&
+ ! empty( $dependency_data['version'] )
+ ) {
+ $more_details_link = $this->get_more_details_link( $dependency_data['name'], $dependency_data['slug'] );
+ $dependencies_list .= sprintf( $has_name_markup, esc_html( $dependency_data['name'] ), $more_details_link );
+ continue;
+ }
+
+ $result = plugins_api( 'plugin_information', array( 'slug' => $dependency ) );
+
+ if ( ! empty( $result->name ) ) {
+ $more_details_link = $this->get_more_details_link( $result->name, $result->slug );
+ $dependencies_list .= sprintf( $has_name_markup, esc_html( $result->name ), $more_details_link );
+ continue;
+ }
+
+ $dependencies_list .= sprintf( $no_name_markup, esc_html( $dependency ) );
+ }
+
+ $dependencies_notice = sprintf(
+ '%s
%s%1$s %2$s
%3$s
%1$s %2$s
%3$s
' . sprintf( + /* translators: %s: Plugin name. */ + _x( 'Error: %s requires plugins that are not installed or activated.', 'plugin' ), + $plugin_headers['Name'] + ) . '
', + $unmet_dependencies + ); + } + return true; } diff --git a/src/wp-admin/includes/post.php b/src/wp-admin/includes/post.php index c93ac71bec525..90aaf2228e371 100644 --- a/src/wp-admin/includes/post.php +++ b/src/wp-admin/includes/post.php @@ -2303,6 +2303,7 @@ function get_block_editor_server_block_settings() { 'keywords' => 'keywords', 'example' => 'example', 'variations' => 'variations', + 'allowed_blocks' => 'allowedBlocks', ); foreach ( $block_registry->get_all_registered() as $block_name => $block_type ) { diff --git a/src/wp-admin/includes/schema.php b/src/wp-admin/includes/schema.php index d339af3b17324..63655ccf174ca 100644 --- a/src/wp-admin/includes/schema.php +++ b/src/wp-admin/includes/schema.php @@ -599,14 +599,12 @@ function populate_options( array $options = array() ) { $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 ); } @@ -1252,6 +1250,7 @@ function populate_network_meta( $network_id, array $meta = array() ) { 'png', 'gif', 'webp', + 'avif', // Video. 'mov', 'avi', diff --git a/src/wp-admin/includes/theme.php b/src/wp-admin/includes/theme.php index 91e92995ece81..70abab68ad799 100644 --- a/src/wp-admin/includes/theme.php +++ b/src/wp-admin/includes/theme.php @@ -114,6 +114,7 @@ function delete_theme( $stylesheet, $redirect = '' ) { foreach ( $translations as $translation => $data ) { $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.po' ); $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.mo' ); + $wp_filesystem->delete( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '.l10n.php' ); $json_translation_files = glob( WP_LANG_DIR . '/themes/' . $stylesheet . '-' . $translation . '-*.json' ); if ( $json_translation_files ) { diff --git a/src/wp-admin/includes/update-core.php b/src/wp-admin/includes/update-core.php index 0c66ad3ee9db0..6d996adb52e38 100644 --- a/src/wp-admin/includes/update-core.php +++ b/src/wp-admin/includes/update-core.php @@ -1848,13 +1848,14 @@ function _upgrade_440_force_deactivate_incompatible_plugins() { * @since 5.9.0 The minimum compatible version of Gutenberg is 11.9. * @since 6.1.1 The minimum compatible version of Gutenberg is 14.1. * @since 6.4.0 The minimum compatible version of Gutenberg is 16.5. + * @since 6.5.0 The minimum compatible version of Gutenberg is 17.6. */ function _upgrade_core_deactivate_incompatible_plugins() { - if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '16.5', '<' ) ) { + if ( defined( 'GUTENBERG_VERSION' ) && version_compare( GUTENBERG_VERSION, '17.6', '<' ) ) { $deactivated_gutenberg['gutenberg'] = array( 'plugin_name' => 'Gutenberg', 'version_deactivated' => GUTENBERG_VERSION, - 'version_compatible' => '16.5', + 'version_compatible' => '17.6', ); if ( is_plugin_active_for_network( 'gutenberg/gutenberg.php' ) ) { $deactivated_plugins = get_site_option( 'wp_force_deactivated_plugins', array() ); diff --git a/src/wp-admin/menu.php b/src/wp-admin/menu.php index 71fd94b2e3842..a756fa40f3624 100644 --- a/src/wp-admin/menu.php +++ b/src/wp-admin/menu.php @@ -205,10 +205,12 @@ if ( wp_is_block_theme() ) { $submenu['themes.php'][6] = array( _x( 'Editor', 'site editor menu item' ), 'edit_theme_options', 'site-editor.php' ); +} else { + $submenu['themes.php'][6] = array( __( 'Patterns', 'site editor menu item' ), 'edit_theme_options', 'edit.php?post_type=wp_block' ); } if ( ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ) { - $submenu['themes.php'][6] = array( + $submenu['themes.php'][7] = array( __( 'Template Parts' ), 'edit_theme_options', 'site-editor.php?path=/wp_template_part/all', @@ -220,7 +222,7 @@ // Hide Customize link on block themes unless a plugin or theme // is using 'customize_register' to add a setting. if ( ! wp_is_block_theme() || has_action( 'customize_register' ) ) { - $position = ( wp_is_block_theme() || current_theme_supports( 'block-template-parts' ) ) ? 7 : 6; + $position = ! wp_is_block_theme() && current_theme_supports( 'block-template-parts' ) ? 8 : 7; $submenu['themes.php'][ $position ] = array( __( 'Customize' ), 'customize', esc_url( $customize_url ), '', 'hide-if-no-customize' ); } diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php index 345f0c09e05c2..da57d95e74fff 100644 --- a/src/wp-admin/plugin-editor.php +++ b/src/wp-admin/plugin-editor.php @@ -295,7 +295,7 @@ diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php index 571b9a9875ab1..a8beb8249bbc7 100644 --- a/src/wp-admin/plugin-install.php +++ b/src/wp-admin/plugin-install.php @@ -134,6 +134,10 @@ * WordPress Administration Template Header. */ require_once ABSPATH . 'wp-admin/admin-header.php'; + +WP_Plugin_Dependencies::display_admin_notice_for_unmet_dependencies(); +WP_Plugin_Dependencies::display_admin_notice_for_deactivated_dependents(); +WP_Plugin_Dependencies::display_admin_notice_for_circular_dependencies(); ?>">
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 93f9c454abe14..f7514ab473b1b 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -739,6 +739,9 @@
}
?>
+
+
+
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 93f9c454abe14..f7514ab473b1b 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -739,6 +739,9 @@
}
?>
+
+
+
-
+
diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php
index c34ac06f242e6..80fbd530b24b6 100644
--- a/src/wp-admin/update-core.php
+++ b/src/wp-admin/update-core.php
@@ -42,7 +42,7 @@ function list_core_update( $update ) {
if ( 'en_US' === $update->locale && 'en_US' === get_locale() ) {
$version_string = $update->current;
- } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
+ } elseif ( 'en_US' === $update->locale && $update->packages->partial && $wp_version === $update->partial_version ) {
$updates = get_core_updates();
if ( $updates && 1 === count( $updates ) ) {
// If the only available update is a partial builds, it doesn't need a language-specific version string.
@@ -179,9 +179,9 @@ function list_core_update( $update ) {
}
echo '';
- if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
+ if ( 'en_US' !== $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package !== $update->locale ) ) {
echo '
- +
' . __( 'This localized version contains both the translation and various other localization fixes.' ) . '
'; - } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) { + } elseif ( 'en_US' === $update->locale && 'en_US' !== get_locale() && ( ! $update->packages->partial && $wp_version === $update->partial_version ) ) { // Partial builds don't need language-specific warnings. echo '' . sprintf(
/* translators: %s: WordPress version. */
diff --git a/src/wp-admin/update.php b/src/wp-admin/update.php
index 29480c2840a57..090c37cfc4dfe 100644
--- a/src/wp-admin/update.php
+++ b/src/wp-admin/update.php
@@ -154,6 +154,10 @@
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' );
// Used in the HTML title tag.
@@ -302,6 +306,10 @@
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' );
// Used in the HTML title tag.
diff --git a/src/wp-content/themes/twentyeleven/functions.php b/src/wp-content/themes/twentyeleven/functions.php
index 3ca5da5882f27..3c7fa3c3a8167 100644
--- a/src/wp-content/themes/twentyeleven/functions.php
+++ b/src/wp-content/themes/twentyeleven/functions.php
@@ -562,7 +562,7 @@ function twentyeleven_page_menu_args( $args ) {
/**
* Register sidebars and widgetized areas.
*
- * Also register the default Epherma widget.
+ * Also register the default Ephemera widget.
*
* @since Twenty Eleven 1.0
*/
diff --git a/src/wp-content/themes/twentyeleven/images/headers/chessboard-thumbnail.jpg b/src/wp-content/themes/twentyeleven/images/headers/chessboard-thumbnail.jpg
index e8c84d3f4d9c68ffac39e385a898a0cc8ffc5800..cb6977e7b6697bf25a73feb007be0b03739dbe92 100644
GIT binary patch
delta 6369
zcmYkAWmuGJyM||mkcI&Uq;u$)p+UO4yHglSQc4+8VUX_b?pOkXv@}QwQVK{&jYtcE
zo3+06?Y*Dlcz-?b`|rH3>%8AIfzJX-g}{O2B61`(0Du9&00RE+U|?bafFSHYLjWq^
z!wvBN-vK}vKuoMZD*%FrPe3FXBme;LC$Rg8aI`D9Gd=7~KW5m?z;RV*99whBsCmKv
zA`s*N%mhY1zY$04GbPFvJM4ZRvUr@4NSE%Zf1qb-h0I+VoB=HAedst5=T-F#Fh-n=
zDN_>Vm$REo!i?7HvWx|qXEXeW(spW`E@^bhEi6B!ewwaS;ThCQH1<&Tq*VJ>;Qm*!
zGEX^eY~yf*kVVa$`ng=S;rO+^e+ID9de760=#AFGj}N5t0Cy=`395eEtu>74S9