jenkins-bot has submitted this change and it was merged.
Change subject: Don't follow redirects any more
......................................................................
Don't follow redirects any more
For some reason the redirect logic in the APIRequest was still active, which
resulted in a page source retrieval loop in [[en:Sudanese_Americans]] which
contains a redirect to itself.
Also fix a small JSHint issue.
Change-Id: I5c3ba98522f5cc51ae1282c206998740c7c24592
---
M js/lib/mediawiki.ApiRequest.js
M js/lib/mediawiki.DOMPostProcessor.js
2 files changed, 3 insertions(+), 22 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.ApiRequest.js b/js/lib/mediawiki.ApiRequest.js
index 7e8c1b3..b600952 100644
--- a/js/lib/mediawiki.ApiRequest.js
+++ b/js/lib/mediawiki.ApiRequest.js
@@ -302,25 +302,6 @@
}
}
- // check for #REDIRECT
- var redirMatch = src.match( /[\r\n\s]*#\s*redirect\s*\[\[([^\]]+)\]\]/i
);
- if ( redirMatch ) {
- title = redirMatch[1];
- var url = this.env.conf.parsoid.apiURI + '?' +
- qs.stringify( {
- format: 'json',
- action: 'query',
- prop: 'revisions',
- rvprop: PARSOID_RVPROP,
- titles: title
- } );
-
//'?format=json&action=query&prop=revisions&rvprop=content&titles=' + title;
- this.requestOptions.url = url;
- this.title = title;
- this.request( this.requestOptions, this._requestCB.bind(this) );
- return;
- }
-
//console.warn( 'Page ' + this.title + ': got ' +
JSON.stringify(metadata) );
this.env.tp( 'Retrieved ' + this.title, metadata );
diff --git a/js/lib/mediawiki.DOMPostProcessor.js
b/js/lib/mediawiki.DOMPostProcessor.js
index 8189d1e..df8e2ec 100644
--- a/js/lib/mediawiki.DOMPostProcessor.js
+++ b/js/lib/mediawiki.DOMPostProcessor.js
@@ -1088,9 +1088,9 @@
// NOTE: Cannot use members of visitedIds to
detect cycles
// since it can contain elements outside the
cycle.
var cycle = findCycle(rId, nestingInfo),
- minId = Math.min.apply(null, cycle),
- // minId is a number, rId, startId are
strings
- minId = minId.toString();
+ minId = Math.min.apply(null, cycle);
+ // minId is a number, rId, startId are strings
+ minId = minId.toString();
// console.warn("Found cycle: " +
JSON.stringify(cycle) + "; Min id: " + minId);
--
To view, visit https://gerrit.wikimedia.org/r/67646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c3ba98522f5cc51ae1282c206998740c7c24592
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
