Skip to content

Commit

Permalink
External Libraries: Remove stray Unicode character in moxie.js
Browse files Browse the repository at this point in the history
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@59770 602fd350-edb4-49c9-b593-d223f7449a82
  • Loading branch information
desrosj committed Feb 6, 2025
1 parent 5b5d358 commit 2c27e7e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
11 changes: 7 additions & 4 deletions src/js/_enqueues/vendor/plupload/moxie.js
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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 */
Expand Down Expand Up @@ -7388,7 +7392,6 @@ define("moxie/runtime/html5/utils/BinaryReader", [
UTF16StringReader.apply(this, arguments);
}
}


Basic.extend(BinaryReader.prototype, {

Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/script-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 ) {
Expand Down

0 comments on commit 2c27e7e

Please sign in to comment.