Adding upstream version 6.5+dfsg1.upstream/6.5+dfsg1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 17 insertions, 122 deletions

diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index c767834..fd00326 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -37,8 +37,6 @@ $_old_files = array(
 	'wp-images/wp-small.png',
 	'wp-images/wpminilogo.png',
 	'wp.php',
-	// 2.0.8
-	'wp-includes/js/tinymce/plugins/inlinepopups/readme.txt',
 	// 2.1
 	'wp-admin/edit-form-ajax-cat.php',
 	'wp-admin/execute-pings.php',
@@ -52,8 +50,6 @@ $_old_files = array(
 	'wp-includes/functions-formatting.php',
 	'wp-includes/functions-post.php',
 	'wp-includes/js/dbx-key.js',
-	'wp-includes/js/tinymce/plugins/autosave/langs/cs.js',
-	'wp-includes/js/tinymce/plugins/autosave/langs/sv.js',
 	'wp-includes/links.php',
 	'wp-includes/pluggable-functions.php',
 	'wp-includes/template-functions-author.php',
@@ -64,7 +60,6 @@ $_old_files = array(
 	'wp-includes/wp-l10n.php',
 	// 2.2
 	'wp-admin/cat-js.php',
-	'wp-admin/import/b2.php',
 	'wp-includes/js/autosave-js.php',
 	'wp-includes/js/list-manipulation-js.php',
 	'wp-includes/js/wp-ajax-js.php',
@@ -108,39 +103,19 @@ $_old_files = array(
 	'wp-admin/js/link-cat.js',
 	'wp-admin/profile-update.php',
 	'wp-admin/templates.php',
-	'wp-includes/images/wlw/WpComments.png',
-	'wp-includes/images/wlw/WpIcon.png',
-	'wp-includes/images/wlw/WpWatermark.png',
 	'wp-includes/js/dbx.js',
 	'wp-includes/js/fat.js',
 	'wp-includes/js/list-manipulation.js',
 	'wp-includes/js/tinymce/langs/en.js',
-	'wp-includes/js/tinymce/plugins/autosave/editor_plugin_src.js',
-	'wp-includes/js/tinymce/plugins/autosave/langs',
 	'wp-includes/js/tinymce/plugins/directionality/images',
 	'wp-includes/js/tinymce/plugins/directionality/langs',
-	'wp-includes/js/tinymce/plugins/inlinepopups/css',
-	'wp-includes/js/tinymce/plugins/inlinepopups/images',
-	'wp-includes/js/tinymce/plugins/inlinepopups/jscripts',
 	'wp-includes/js/tinymce/plugins/paste/images',
 	'wp-includes/js/tinymce/plugins/paste/jscripts',
 	'wp-includes/js/tinymce/plugins/paste/langs',
-	'wp-includes/js/tinymce/plugins/spellchecker/classes/HttpClient.class.php',
-	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyGoogleSpell.class.php',
-	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspell.class.php',
-	'wp-includes/js/tinymce/plugins/spellchecker/classes/TinyPspellShell.class.php',
-	'wp-includes/js/tinymce/plugins/spellchecker/css/spellchecker.css',
-	'wp-includes/js/tinymce/plugins/spellchecker/images',
-	'wp-includes/js/tinymce/plugins/spellchecker/langs',
-	'wp-includes/js/tinymce/plugins/spellchecker/tinyspell.php',
 	'wp-includes/js/tinymce/plugins/wordpress/images',
 	'wp-includes/js/tinymce/plugins/wordpress/langs',
 	'wp-includes/js/tinymce/plugins/wordpress/wordpress.css',
 	'wp-includes/js/tinymce/plugins/wphelp',
-	'wp-includes/js/tinymce/themes/advanced/css',
-	'wp-includes/js/tinymce/themes/advanced/images',
-	'wp-includes/js/tinymce/themes/advanced/jscripts',
-	'wp-includes/js/tinymce/themes/advanced/langs',
 	// 2.5.1
 	'wp-includes/js/tinymce/tiny_mce_gzip.php',
 	// 2.6
@@ -184,16 +159,11 @@ $_old_files = array(
 	'wp-includes/js/tinymce/tiny_mce_ext.js',
 	// 2.8
 	'wp-admin/js/users.js',
-	'wp-includes/js/swfupload/plugins/swfupload.documentready.js',
-	'wp-includes/js/swfupload/plugins/swfupload.graceful_degradation.js',
 	'wp-includes/js/swfupload/swfupload_f9.swf',
 	'wp-includes/js/tinymce/plugins/autosave',
 	'wp-includes/js/tinymce/plugins/paste/css',
 	'wp-includes/js/tinymce/utils/mclayer.js',
 	'wp-includes/js/tinymce/wordpress.css',
-	// 2.8.5
-	'wp-admin/import/btt.php',
-	'wp-admin/import/jkw.php',
 	// 2.9
 	'wp-admin/js/page.dev.js',
 	'wp-admin/js/page.js',
@@ -250,12 +220,9 @@ $_old_files = array(
 	'wp-admin/wp-admin.css',
 	'wp-admin/wp-admin.dev.css',
 	'wp-includes/js/codepress',
-	'wp-includes/js/codepress/engines/khtml.js',
-	'wp-includes/js/codepress/engines/older.js',
 	'wp-includes/js/jquery/autocomplete.dev.js',
 	'wp-includes/js/jquery/autocomplete.js',
 	'wp-includes/js/jquery/interface.js',
-	'wp-includes/js/scriptaculous/prototype.js',
 	// Following file added back in 5.1, see #45645.
 	//'wp-includes/js/tinymce/wp-tinymce.js',
 	// 3.1
@@ -277,7 +244,6 @@ $_old_files = array(
 	'wp-admin/sidebar.php',
 	'wp-includes/classes.php',
 	'wp-includes/js/tinymce/blank.htm',
-	'wp-includes/js/tinymce/plugins/media/css/content.css',
 	'wp-includes/js/tinymce/plugins/media/img',
 	'wp-includes/js/tinymce/plugins/safari',
 	// 3.2
@@ -286,11 +252,6 @@ $_old_files = array(
 	'wp-admin/js/list-table.dev.js',
 	'wp-admin/js/list-table.js',
 	'wp-includes/default-embeds.php',
-	'wp-includes/js/tinymce/plugins/wordpress/img/help.gif',
-	'wp-includes/js/tinymce/plugins/wordpress/img/more.gif',
-	'wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif',
-	'wp-includes/js/tinymce/themes/advanced/img/fm.gif',
-	'wp-includes/js/tinymce/themes/advanced/img/sflogo.png',
 	// 3.3
 	'wp-admin/css/colors-classic-rtl.css',
 	'wp-admin/css/colors-classic-rtl.dev.css',
@@ -346,12 +307,6 @@ $_old_files = array(
 	'wp-includes/js/tinymce/plugins/wplink/css',
 	'wp-includes/js/tinymce/plugins/wplink/img',
 	'wp-includes/js/tinymce/plugins/wplink/js',
-	'wp-includes/js/tinymce/themes/advanced/img/wpicons.png',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/butt2.png',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/button_bg.png',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/down_arrow.gif',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/fade-butt.png',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/separator.gif',
 	// Don't delete, yet: 'wp-rss.php',
 	// Don't delete, yet: 'wp-rdf.php',
 	// Don't delete, yet: 'wp-rss2.php',
@@ -365,27 +320,14 @@ $_old_files = array(
 	'wp-admin/index-extra.php',
 	'wp-admin/network/index-extra.php',
 	'wp-admin/user/index-extra.php',
-	'wp-admin/images/screenshots/admin-flyouts.png',
-	'wp-admin/images/screenshots/coediting.png',
-	'wp-admin/images/screenshots/drag-and-drop.png',
-	'wp-admin/images/screenshots/help-screen.png',
-	'wp-admin/images/screenshots/media-icon.png',
-	'wp-admin/images/screenshots/new-feature-pointer.png',
-	'wp-admin/images/screenshots/welcome-screen.png',
 	'wp-includes/css/editor-buttons.css',
 	'wp-includes/css/editor-buttons.dev.css',
 	'wp-includes/js/tinymce/plugins/paste/blank.htm',
 	'wp-includes/js/tinymce/plugins/wordpress/css',
 	'wp-includes/js/tinymce/plugins/wordpress/editor_plugin.dev.js',
-	'wp-includes/js/tinymce/plugins/wordpress/img/embedded.png',
-	'wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif',
-	'wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif',
 	'wp-includes/js/tinymce/plugins/wpdialogs/editor_plugin.dev.js',
-	'wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css',
 	'wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.dev.js',
-	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.dev.js',
 	'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.dev.js',
-	'wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png',
 	'wp-includes/js/tinymce/plugins/wplink/editor_plugin.dev.js',
 	// Don't delete, yet: 'wp-pass.php',
 	// Don't delete, yet: 'wp-register.php',
@@ -500,9 +442,6 @@ $_old_files = array(
 	'wp-admin/js/inline-edit-post.dev.js',
 	'wp-admin/js/categories.dev.js',
 	'wp-admin/js/editor.dev.js',
-	'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.dev.js',
-	'wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js',
-	'wp-includes/js/tinymce/plugins/wpdialogs/js/wpdialog.dev.js',
 	'wp-includes/js/plupload/handlers.dev.js',
 	'wp-includes/js/plupload/wp-plupload.dev.js',
 	'wp-includes/js/swfupload/handlers.dev.js',
@@ -529,21 +468,11 @@ $_old_files = array(
 	'wp-includes/js/jquery/ui/jquery.effects.pulsate.min.js',
 	'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js',
 	'wp-includes/js/jquery/ui/jquery.effects.fold.min.js',
-	'wp-admin/images/screenshots/captions-1.png',
-	'wp-admin/images/screenshots/captions-2.png',
-	'wp-admin/images/screenshots/flex-header-1.png',
-	'wp-admin/images/screenshots/flex-header-2.png',
-	'wp-admin/images/screenshots/flex-header-3.png',
-	'wp-admin/images/screenshots/flex-header-media-library.png',
-	'wp-admin/images/screenshots/theme-customizer.png',
-	'wp-admin/images/screenshots/twitter-embed-1.png',
-	'wp-admin/images/screenshots/twitter-embed-2.png',
 	'wp-admin/js/utils.js',
 	// Added back in 5.3 [45448], see #43895.
 	// 'wp-admin/options-privacy.php',
 	'wp-app.php',
 	'wp-includes/class-wp-atom-server.php',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css',
 	// 3.5.2
 	'wp-includes/js/swfupload/swfupload-all.js',
 	// 3.6
@@ -556,10 +485,7 @@ $_old_files = array(
 	// 3.7
 	'wp-admin/js/cat.js',
 	'wp-admin/js/cat.min.js',
-	'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js',
 	// 3.8
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/page_bug.gif',
-	'wp-includes/js/tinymce/themes/advanced/skins/wp_theme/img/more_bug.gif',
 	'wp-includes/js/thickbox/tb-close-2x.png',
 	'wp-includes/js/thickbox/tb-close.png',
 	'wp-includes/images/wpmini-blue-2x.png',
@@ -630,7 +556,6 @@ $_old_files = array(
 	'wp-includes/js/tinymce/plugins/wpeditimage/js',
 	'wp-includes/js/tinymce/plugins/wpeditimage/css',
 	'wp-includes/js/tinymce/plugins/wpgallery/img',
-	'wp-includes/js/tinymce/plugins/wpfullscreen/css',
 	'wp-includes/js/tinymce/plugins/paste/js',
 	'wp-includes/js/tinymce/themes/advanced',
 	'wp-includes/js/tinymce/tiny_mce.js',
@@ -659,8 +584,6 @@ $_old_files = array(
 	'wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js',
 	'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin.js',
 	'wp-includes/js/tinymce/plugins/tabfocus/editor_plugin_src.js',
-	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin.js',
-	'wp-includes/js/tinymce/plugins/wpfullscreen/editor_plugin_src.js',
 	'wp-includes/js/tinymce/plugins/paste/editor_plugin.js',
 	'wp-includes/js/tinymce/plugins/paste/pasteword.htm',
 	'wp-includes/js/tinymce/plugins/paste/editor_plugin_src.js',
@@ -750,27 +673,6 @@ $_old_files = array(
 	'wp-includes/js/swfupload/swfupload.swf',
 	// 4.9.2
 	'wp-includes/js/mediaelement/lang',
-	'wp-includes/js/mediaelement/lang/ca.js',
-	'wp-includes/js/mediaelement/lang/cs.js',
-	'wp-includes/js/mediaelement/lang/de.js',
-	'wp-includes/js/mediaelement/lang/es.js',
-	'wp-includes/js/mediaelement/lang/fa.js',
-	'wp-includes/js/mediaelement/lang/fr.js',
-	'wp-includes/js/mediaelement/lang/hr.js',
-	'wp-includes/js/mediaelement/lang/hu.js',
-	'wp-includes/js/mediaelement/lang/it.js',
-	'wp-includes/js/mediaelement/lang/ja.js',
-	'wp-includes/js/mediaelement/lang/ko.js',
-	'wp-includes/js/mediaelement/lang/nl.js',
-	'wp-includes/js/mediaelement/lang/pl.js',
-	'wp-includes/js/mediaelement/lang/pt.js',
-	'wp-includes/js/mediaelement/lang/ro.js',
-	'wp-includes/js/mediaelement/lang/ru.js',
-	'wp-includes/js/mediaelement/lang/sk.js',
-	'wp-includes/js/mediaelement/lang/sv.js',
-	'wp-includes/js/mediaelement/lang/uk.js',
-	'wp-includes/js/mediaelement/lang/zh-cn.js',
-	'wp-includes/js/mediaelement/lang/zh.js',
 	'wp-includes/js/mediaelement/mediaelement-flash-audio-ogg.swf',
 	'wp-includes/js/mediaelement/mediaelement-flash-audio.swf',
 	'wp-includes/js/mediaelement/mediaelement-flash-video-hls.swf',
@@ -787,7 +689,6 @@ $_old_files = array(
 	// 5.0
 	'wp-includes/js/codemirror/jshint.js',
 	// 5.1
-	'wp-includes/random_compat/random_bytes_openssl.php',
 	'wp-includes/js/tinymce/wp-tinymce.js.gz',
 	// 5.3
 	'wp-includes/js/wp-a11y.js',     // Moved to: wp-includes/js/dist/a11y.js
@@ -822,7 +723,6 @@ $_old_files = array(
 	'wp-includes/block-patterns/text-two-columns-with-images.php',
 	'wp-includes/block-patterns/text-two-columns.php',
 	'wp-includes/block-patterns/large-header-button.php',
-	'wp-includes/blocks/subhead/block.json',
 	'wp-includes/blocks/subhead',
 	'wp-includes/css/dist/editor/editor-styles.css',
 	'wp-includes/css/dist/editor/editor-styles.min.css',
@@ -833,10 +733,6 @@ $_old_files = array(
 	'wp-includes/blocks/heading/editor.min.css',
 	'wp-includes/blocks/heading/editor-rtl.css',
 	'wp-includes/blocks/heading/editor-rtl.min.css',
-	'wp-includes/blocks/post-content/editor.css',
-	'wp-includes/blocks/post-content/editor.min.css',
-	'wp-includes/blocks/post-content/editor-rtl.css',
-	'wp-includes/blocks/post-content/editor-rtl.min.css',
 	'wp-includes/blocks/query-title/editor.css',
 	'wp-includes/blocks/query-title/editor.min.css',
 	'wp-includes/blocks/query-title/editor-rtl.css',
@@ -847,21 +743,7 @@ $_old_files = array(
 	'wp-includes/blocks/tag-cloud/editor-rtl.min.css',
 	// 6.1
 	'wp-includes/blocks/post-comments.php',
-	'wp-includes/blocks/post-comments/block.json',
-	'wp-includes/blocks/post-comments/editor.css',
-	'wp-includes/blocks/post-comments/editor.min.css',
-	'wp-includes/blocks/post-comments/editor-rtl.css',
-	'wp-includes/blocks/post-comments/editor-rtl.min.css',
-	'wp-includes/blocks/post-comments/style.css',
-	'wp-includes/blocks/post-comments/style.min.css',
-	'wp-includes/blocks/post-comments/style-rtl.css',
-	'wp-includes/blocks/post-comments/style-rtl.min.css',
 	'wp-includes/blocks/post-comments',
-	'wp-includes/blocks/comments-query-loop/block.json',
-	'wp-includes/blocks/comments-query-loop/editor.css',
-	'wp-includes/blocks/comments-query-loop/editor.min.css',
-	'wp-includes/blocks/comments-query-loop/editor-rtl.css',
-	'wp-includes/blocks/comments-query-loop/editor-rtl.min.css',
 	'wp-includes/blocks/comments-query-loop',
 	// 6.3
 	'wp-includes/images/wlw',
@@ -871,6 +753,18 @@ $_old_files = array(
 	'wp-includes/navigation-fallback.php',
 	'wp-includes/blocks/navigation/view-modal.min.js',
 	'wp-includes/blocks/navigation/view-modal.js',
+	// 6.5
+	'wp-includes/ID3/license.commercial.txt',
+	'wp-includes/blocks/query/style-rtl.min.css',
+	'wp-includes/blocks/query/style.min.css',
+	'wp-includes/blocks/query/style-rtl.css',
+	'wp-includes/blocks/query/style.css',
+	'wp-admin/images/about-header-privacy.svg',
+	'wp-admin/images/about-header-about.svg',
+	'wp-admin/images/about-header-credits.svg',
+	'wp-admin/images/about-header-freedoms.svg',
+	'wp-admin/images/about-header-contribute.svg',
+	'wp-admin/images/about-header-background.svg',
 );
 
 /**
@@ -1008,7 +902,7 @@ $_new_bundled_files = array(
  * Upgrades the core of WordPress.
  *
  * This will create a .maintenance file at the base of the WordPress directory
- * to ensure that people can not access the web site, when the files are being
+ * to ensure that people can not access the website, when the files are being
  * copied to their locations.
  *
  * The files in the `$_old_files` list will be removed and the new files
@@ -1093,7 +987,7 @@ function update_core( $from, $to ) {
 	 */
 	apply_filters( 'update_feedback', __( 'Verifying the unpacked files…' ) );
 
-	// Sanity check the unzipped distribution.
+	// Confidence check the unzipped distribution.
 	$distro = '';
 	$roots  = array( '/wordpress/', '/wordpress-mu/' );
 
@@ -1848,13 +1742,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() );