jenkins-bot has submitted this change and it was merged.
Change subject: Use $.toJSON instead of JSON.parse for compatability and
......................................................................
Use $.toJSON instead of JSON.parse for compatability and
consistency with other parts that a commonly used by all browsers.
Restores compatability with IE 7 which is still responsible for 1.8% of
the page views at Wikimedia.
So this can be seen as a fix to a regression introduced with
I5f35a701843baa19
Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
---
M resources/mw.IframeTransport.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.IframeTransport.js b/resources/mw.IframeTransport.js
index 415f722..7621f37 100644
--- a/resources/mw.IframeTransport.js
+++ b/resources/mw.IframeTransport.js
@@ -99,7 +99,7 @@
// check that the JSON is not an XML error message
// (this happens when user aborts upload, we get the
API docs in XML wrapped in HTML)
if ( json && json.substring(0, 5) !== '<?xml' ) {
- response = JSON.parse( json );
+ response = $.parseJSON( json );
} else {
response = {};
}
--
To view, visit https://gerrit.wikimedia.org/r/86828
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3920e14d860c8dd5c67ed53e4b82d452118d12d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Rillke <rainerril...@hotmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
