From 12c626c82e84b2325ceff13a6d9a56a56091c548 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 25 Oct 2017 00:02:50 +0000 Subject: [PATCH] Update `$_old_files` to add the deleted MediaElement.js files when it was upgraded from 2.22.0 to 4.2.3. Amends [41198]. See #39686. Fixes #42097. Built from https://develop.svn.wordpress.org/trunk@42015 git-svn-id: http://core.svn.wordpress.org/trunk@41849 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/update-core.php | 29 ++++++++++++++++++++--------- wp-includes/version.php | 2 +- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 82903f76df..9f7889ac62 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -714,24 +714,35 @@ $_old_files = array( 'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.json', 'wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css', // 4.9 -'wp-includes/js/plupload/plupload.flash.swf', -'wp-includes/js/plupload/plupload.silverlight.xap', -'wp-includes/js/plupload/plupload.full.min.js', -'wp-includes/js/swfupload/plugins', -'wp-includes/js/swfupload/swfupload.swf', -'wp-admin/css/press-this-editor.css', 'wp-admin/css/press-this-editor-rtl.css', 'wp-admin/css/press-this-editor-rtl.min.css', +'wp-admin/css/press-this-editor.css', 'wp-admin/css/press-this-editor.min.css', -'wp-admin/css/press-this.css', 'wp-admin/css/press-this-rtl.css', 'wp-admin/css/press-this-rtl.min.css', +'wp-admin/css/press-this.css', 'wp-admin/css/press-this.min.css', 'wp-admin/includes/class-wp-press-this.php', -'wp-admin/js/press-this.js', -'wp-admin/js/press-this.min.js', 'wp-admin/js/bookmarklet.js', 'wp-admin/js/bookmarklet.min.js', +'wp-admin/js/press-this.js', +'wp-admin/js/press-this.min.js', +'wp-includes/js/mediaelement/background.png', +'wp-includes/js/mediaelement/bigplay.png', +'wp-includes/js/mediaelement/bigplay.svg', +'wp-includes/js/mediaelement/controls.png', +'wp-includes/js/mediaelement/controls.svg', +'wp-includes/js/mediaelement/flashmediaelement.swf', +'wp-includes/js/mediaelement/froogaloop.min.js', +'wp-includes/js/mediaelement/jumpforward.png', +'wp-includes/js/mediaelement/loading.gif', +'wp-includes/js/mediaelement/silverlightmediaelement.xap', +'wp-includes/js/mediaelement/skipback.png', +'wp-includes/js/plupload/plupload.flash.swf', +'wp-includes/js/plupload/plupload.full.min.js', +'wp-includes/js/plupload/plupload.silverlight.xap', +'wp-includes/js/swfupload/plugins', +'wp-includes/js/swfupload/swfupload.swf', ); /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 920122f2dd..bb367db639 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-beta3-42014'; +$wp_version = '4.9-beta3-42015'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.