From a5f8e0917fd6e2c448141b08b31105c306f3dc8b Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 15 Nov 2017 19:00:38 +0000 Subject: [PATCH] Editor: Disable `wp_keep_scroll_position` in IE11 since buggy; fix `matches` polyfill conflict with ME.js by doing runtime feature detection in context window. Props westonruter, SergeyBiryukov, Clorith for testing. See #41962, #42029. Fixes #42553 for 4.9. Built from https://develop.svn.wordpress.org/branches/4.9@42192 git-svn-id: http://core.svn.wordpress.org/branches/4.9@42022 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/edit-form-advanced.php | 2 +- wp-includes/version.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 07c2dfe129..2400521804 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -639,7 +639,7 @@ if ( post_type_supports($post_type, 'editor') ) { 'resize' => false, 'wp_autoresize_on' => $_wp_editor_expand, 'add_unload_trigger' => false, - 'wp_keep_scroll_position' => true, + 'wp_keep_scroll_position' => ! $is_IE, ), ) ); ?> diff --git a/wp-includes/version.php b/wp-includes/version.php index 286a600684..ff5977cbb2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-RC3-42190'; +$wp_version = '4.9-RC3-42192'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. @@ -18,7 +18,7 @@ $wp_db_version = 38590; * * @global string $tinymce_version */ -$tinymce_version = '4607-20170918'; +$tinymce_version = '4607-20171115'; /** * Holds the required PHP version