IoannisKydonis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267174
Change subject: Use "&" instead of "\u0026".
......................................................................
Use "&" instead of "\u0026".
Bug: T107289
Change-Id: Ica40630fbef991e3bf4b66d35ac663df94827934
---
M includes/content/JavaScriptContent.php
M tests/phpunit/includes/OutputPageTest.php
M tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
M tests/phpunit/includes/content/JavaScriptContentTest.php
M tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
5 files changed, 17 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/74/267174/1
diff --git a/includes/content/JavaScriptContent.php
b/includes/content/JavaScriptContent.php
index 6d23656..340ea2b 100644
--- a/includes/content/JavaScriptContent.php
+++ b/includes/content/JavaScriptContent.php
@@ -104,7 +104,7 @@
$text = $this->getNativeData();
if ( strpos( $text, '/* #REDIRECT */' ) === 0 ) {
// Extract the title from the url
- preg_match( '/title=(.*?)\\\\u0026action=raw/', $text,
$matches );
+ preg_match( '/title=(.*?)\\\&action=raw/', $text,
$matches );
if ( isset( $matches[1] ) ) {
$title = Title::newFromText( $matches[1] );
if ( $title ) {
diff --git a/tests/phpunit/includes/OutputPageTest.php
b/tests/phpunit/includes/OutputPageTest.php
index f5ef016..287d17d 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -143,7 +143,7 @@
array(
array( 'test.foo',
ResourceLoaderModule::TYPE_SCRIPTS ),
"<script>window.RLQ = window.RLQ || [];
window.RLQ.push( function () {\n"
- .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.foo\u0026only=scripts\u0026skin=fallback";);'
+ .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.foo&only=scripts&skin=fallback";);'
. "\n} );</script>"
),
array(
@@ -187,10 +187,10 @@
array(
array( array( 'test.group.foo',
'test.group.bar' ), ResourceLoaderModule::TYPE_COMBINED ),
"<script>window.RLQ = window.RLQ || [];
window.RLQ.push( function () {\n"
- .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.bar\u0026skin=fallback";);'
+ .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.group.bar&skin=fallback";);'
. "\n} );</script>\n"
. "<script>window.RLQ = window.RLQ ||
[]; window.RLQ.push( function () {\n"
- .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.foo\u0026skin=fallback";);'
+ .
'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false&lang=en&modules=test.group.foo&skin=fallback";);'
. "\n} );</script>"
),
);
diff --git a/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
b/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
index d9487a0..9e083bc 100644
--- a/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentHandlerTest.php
@@ -23,9 +23,9 @@
public static function provideMakeRedirectContent() {
// @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
- array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");'
),
- array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js\u0026action=raw\u0026ctype=text/javascript");'
),
- array( 'Gadget:FooBaz.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js\u0026action=raw\u0026ctype=text/javascript");'
),
+ array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js&action=raw&ctype=text/javascript");'
),
+ array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js&action=raw&ctype=text/javascript");'
),
+ array( 'Gadget:FooBaz.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js&action=raw&ctype=text/javascript");'
),
);
// @codingStandardsIgnoreEnd
}
diff --git a/tests/phpunit/includes/content/JavaScriptContentTest.php
b/tests/phpunit/includes/content/JavaScriptContentTest.php
index a636e56..6e66eaf 100644
--- a/tests/phpunit/includes/content/JavaScriptContentTest.php
+++ b/tests/phpunit/includes/content/JavaScriptContentTest.php
@@ -279,8 +279,8 @@
// @codingStandardsIgnoreStart Generic.Files.LineLength
array(
- '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");',
- '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=TestUpdateRedirect_target\u0026action=raw\u0026ctype=text/javascript");'
+ '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js&action=raw&ctype=text/javascript");',
+ '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=TestUpdateRedirect_target&action=raw&ctype=text/javascript");'
)
// @codingStandardsIgnoreEnd
);
@@ -334,13 +334,13 @@
public static function provideGetRedirectTarget() {
// @codingStandardsIgnoreStart Generic.Files.LineLength
return array(
- array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js\u0026action=raw\u0026ctype=text/javascript");'
),
- array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js\u0026action=raw\u0026ctype=text/javascript");'
),
- array( 'Gadget:FooBaz.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js\u0026action=raw\u0026ctype=text/javascript");'
),
+ array( 'MediaWiki:MonoBook.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=MediaWiki:MonoBook.js&action=raw&ctype=text/javascript");'
),
+ array( 'User:FooBar/common.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=User:FooBar/common.js&action=raw&ctype=text/javascript");'
),
+ array( 'Gadget:FooBaz.js', '/* #REDIRECT
*/mw.loader.load("//example.org/w/index.php?title=Gadget:FooBaz.js&action=raw&ctype=text/javascript");'
),
// No #REDIRECT comment
- array( null,
'mw.loader.load("//example.org/w/index.php?title=MediaWiki:NoRedirect.js\u0026action=raw\u0026ctype=text/javascript");'
),
+ array( null,
'mw.loader.load("//example.org/w/index.php?title=MediaWiki:NoRedirect.js&action=raw&ctype=text/javascript");'
),
// Different domain
- array( null, '/* #REDIRECT
*/mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js\u0026action=raw\u0026ctype=text/javascript");'
),
+ array( null, '/* #REDIRECT
*/mw.loader.load("//example.com/w/index.php?title=MediaWiki:OtherWiki.js&action=raw&ctype=text/javascript");'
),
);
// @codingStandardsIgnoreEnd
}
diff --git
a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
index 9a36d18..643fa3f 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderStartUpModuleTest.php
@@ -159,7 +159,7 @@
[],
null,
null,
- "return !!( window.JSON \u0026\u0026 JSON.parse \u0026\u0026
JSON.stringify);"
+ "return !!( window.JSON && JSON.parse && JSON.stringify);"
],
[
"test.z.foo",
@@ -363,7 +363,7 @@
. 'mw.loader.register(['
. '["test.blank","{blankVer}"],'
. '["test.min","{blankVer}",[0],null,null,'
- .
'"return!!(window.JSON\u0026\u0026JSON.parse\u0026\u0026JSON.stringify);"'
+ . '"return!!(window.JSON&&JSON.parse&&JSON.stringify);"'
. ']]);';
$this->assertEquals(
@@ -398,7 +398,7 @@
],
null,
null,
- "return !!( window.JSON \u0026\u0026 JSON.parse \u0026\u0026
JSON.stringify);"
+ "return !!( window.JSON && JSON.parse && JSON.stringify);"
]
] );';
--
To view, visit https://gerrit.wikimedia.org/r/267174
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica40630fbef991e3bf4b66d35ac663df94827934
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: IoannisKydonis <gianisk...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
