From 16bc9210d64658b1071fd9b4c84f6a12910f17e5 Mon Sep 17 00:00:00 2001 From: desrosj Date: Thu, 6 Feb 2025 18:29:22 +0000 Subject: [PATCH] External Libraries: Remove stray Unicode character in moxie.js This fixes a `ReferenceError` caused by a stray Unicode character in the unminified version of moxie.js. This has long been fixed upstream but the library cannot be wholesale updated in WordPress because of an incompatible license change. Because of this, a new version is being tagged, `1.3.5.1`, and the file header has been updated to make it more clear that the file is a maintained fork with a high level list of changes made. Props kinggmobb, jorbin, q0rban, azaozz, desrosj, sukhendu2002. Fixes #59329. Built from https://develop.svn.wordpress.org/trunk@59770 git-svn-id: http://core.svn.wordpress.org/trunk@59112 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/plupload/moxie.js | 11 +++++++---- wp-includes/script-loader.php | 2 +- wp-includes/version.php | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/wp-includes/js/plupload/moxie.js b/wp-includes/js/plupload/moxie.js index c7d26f4c4e..dbf635f41c 100644 --- a/wp-includes/js/plupload/moxie.js +++ b/wp-includes/js/plupload/moxie.js @@ -1,7 +1,7 @@ ;var MXI_DEBUG = false; /** * mOxie - multi-runtime File API & XMLHttpRequest L2 Polyfill - * v1.3.5 + * v1.3.5.1 * * Copyright 2013, Moxiecode Systems AB * Released under GPL License. @@ -16,8 +16,12 @@ */ /** - * Modified for WordPress, Silverlight and Flash runtimes support was removed. - * See https://core.trac.wordpress.org/ticket/41755. + * Modified for WordPress. + * - Silverlight and Flash runtimes support was removed. See https://core.trac.wordpress.org/ticket/41755. + * - A stray Unicode character has been removed. See https://core.trac.wordpress.org/ticket/59329. + * + * This is a de-facto fork of the mOxie library that will be maintained by WordPress due to upstream license changes + * that are incompatible with the GPL. */ /*jshint smarttabs:true, undef:true, latedef:true, curly:true, bitwise:true, camelcase:true */ @@ -7388,7 +7392,6 @@ define("moxie/runtime/html5/utils/BinaryReader", [ UTF16StringReader.apply(this, arguments); } } -   Basic.extend(BinaryReader.prototype, { diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 19813615bd..15ee7c6d25 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -1011,7 +1011,7 @@ function wp_default_scripts( $scripts ) { 'file_url_copied' => __( 'The file URL has been copied to your clipboard' ), ); - $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' ); + $scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5.1' ); $scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.1.9' ); // Back compat handles: foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index a3c89a6723..6fd13fc461 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.8-alpha-59769'; +$wp_version = '6.8-alpha-59770'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.