Skip to content

Commit 2c27e7e

Browse files
committed
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. git-svn-id: https://develop.svn.wordpress.org/trunk@59770 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 5b5d358 commit 2c27e7e

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/js/_enqueues/vendor/plupload/moxie.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
;var MXI_DEBUG = false;
22
/**
33
* mOxie - multi-runtime File API & XMLHttpRequest L2 Polyfill
4-
* v1.3.5
4+
* v1.3.5.1
55
*
66
* Copyright 2013, Moxiecode Systems AB
77
* Released under GPL License.
@@ -16,8 +16,12 @@
1616
*/
1717

1818
/**
19-
* Modified for WordPress, Silverlight and Flash runtimes support was removed.
20-
* See https://core.trac.wordpress.org/ticket/41755.
19+
* Modified for WordPress.
20+
* - Silverlight and Flash runtimes support was removed. See https://core.trac.wordpress.org/ticket/41755.
21+
* - A stray Unicode character has been removed. See https://core.trac.wordpress.org/ticket/59329.
22+
*
23+
* This is a de-facto fork of the mOxie library that will be maintained by WordPress due to upstream license changes
24+
* that are incompatible with the GPL.
2125
*/
2226

2327
/*jshint smarttabs:true, undef:true, latedef:true, curly:true, bitwise:true, camelcase:true */
@@ -7388,7 +7392,6 @@ define("moxie/runtime/html5/utils/BinaryReader", [
73887392
UTF16StringReader.apply(this, arguments);
73897393
}
73907394
}
7391-
 
73927395

73937396
Basic.extend(BinaryReader.prototype, {
73947397

src/wp-includes/script-loader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1011,7 +1011,7 @@ function wp_default_scripts( $scripts ) {
10111011
'file_url_copied' => __( 'The file URL has been copied to your clipboard' ),
10121012
);
10131013

1014-
$scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5' );
1014+
$scripts->add( 'moxiejs', "/wp-includes/js/plupload/moxie$suffix.js", array(), '1.3.5.1' );
10151015
$scripts->add( 'plupload', "/wp-includes/js/plupload/plupload$suffix.js", array( 'moxiejs' ), '2.1.9' );
10161016
// Back compat handles:
10171017
foreach ( array( 'all', 'html5', 'flash', 'silverlight', 'html4' ) as $handle ) {

0 commit comments

Comments
 (0)