Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/302847
Change subject: The action api uri should never be null
......................................................................
The action api uri should never be null
* We assert this in `setMwApi`
Change-Id: I3e8324fc7c009ca7a8858ebf582e194e5dc52d58
---
M lib/config/WikiConfig.js
M lib/wt2html/DOMPostProcessor.js
M lib/wt2html/tt/ExtensionHandler.js
M lib/wt2html/tt/TemplateHandler.js
4 files changed, 19 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/47/302847/1
diff --git a/lib/config/WikiConfig.js b/lib/config/WikiConfig.js
index 570340b..37a4f2a 100644
--- a/lib/config/WikiConfig.js
+++ b/lib/config/WikiConfig.js
@@ -99,7 +99,7 @@
var mwApiConf = env.conf.parsoid.mwApiMap.get(prefix);
// The URI for api.php on this wiki.
- this.apiURI = mwApiConf.uri || null;
+ this.apiURI = mwApiConf.uri;
// The proxy to use for this wiki.
this.apiProxy = env.getAPIProxy(prefix);
diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js
index 7a0e854..1124937 100644
--- a/lib/wt2html/DOMPostProcessor.js
+++ b/lib/wt2html/DOMPostProcessor.js
@@ -326,27 +326,24 @@
appendToHead(document, 'base', { href: env.conf.wiki.baseURI });
// Hack: link styles
- // We assume that load.php is available at the same location as api.php
- if (env.conf.wiki.apiURI) {
- var modules = [
- 'mediawiki.legacy.commonPrint,shared',
- 'mediawiki.skinning.elements',
- 'mediawiki.skinning.content',
- 'mediawiki.skinning.interface',
- 'skins.vector.styles',
- 'site',
- 'mediawiki.skinning.content.parsoid',
- 'ext.cite.style',
- ];
- if (env.page.extensionModuleStyles) {
- env.page.extensionModuleStyles.forEach(function(module)
{
- modules.push(module);
- });
- }
- var styleURI =
env.conf.parsoid.getModulesLoadURI(env.conf.wiki) +
- '?modules=' + modules.join('|') +
'&only=styles&skin=vector';
- appendToHead(document, 'link', { rel: 'stylesheet', href:
styleURI });
+ var modules = [
+ 'mediawiki.legacy.commonPrint,shared',
+ 'mediawiki.skinning.elements',
+ 'mediawiki.skinning.content',
+ 'mediawiki.skinning.interface',
+ 'skins.vector.styles',
+ 'site',
+ 'mediawiki.skinning.content.parsoid',
+ 'ext.cite.style',
+ ];
+ if (env.page.extensionModuleStyles) {
+ env.page.extensionModuleStyles.forEach(function(module) {
+ modules.push(module);
+ });
}
+ var styleURI = env.conf.parsoid.getModulesLoadURI(env.conf.wiki) +
+ '?modules=' + modules.join('|') + '&only=styles&skin=vector';
+ appendToHead(document, 'link', { rel: 'stylesheet', href: styleURI });
// Stick data attributes in the head
if (env.pageBundle) {
diff --git a/lib/wt2html/tt/ExtensionHandler.js
b/lib/wt2html/tt/ExtensionHandler.js
index cc87fed..9ab5f9c 100644
--- a/lib/wt2html/tt/ExtensionHandler.js
+++ b/lib/wt2html/tt/ExtensionHandler.js
@@ -25,8 +25,6 @@
ExtensionHandler.prototype.rank = 1.11;
ExtensionHandler.prototype.init = function() {
- this.usePHPPreProcessor = this.env.conf.parsoid.usePHPPreProcessor &&
- (this.env.conf.wiki.apiURI !== null);
// Extension content expansion
this.manager.addTransform(this.onExtension.bind(this),
"ExtensionHandler:onExtension", this.rank, 'tag', 'extension');
diff --git a/lib/wt2html/tt/TemplateHandler.js
b/lib/wt2html/tt/TemplateHandler.js
index 0e1707d..7fe513e 100644
--- a/lib/wt2html/tt/TemplateHandler.js
+++ b/lib/wt2html/tt/TemplateHandler.js
@@ -108,7 +108,7 @@
this.convertAttribsToString(state, token.attribs, cb);
return;
}
- if (env.conf.parsoid.usePHPPreProcessor && env.conf.wiki.apiURI !==
null) {
+ if (env.conf.parsoid.usePHPPreProcessor) {
if (this.options.wrapTemplates) {
// Use MediaWiki's action=expandtemplates preprocessor
// We'll never get to frame depth beyond 1 in this
scenario
--
To view, visit https://gerrit.wikimedia.org/r/302847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e8324fc7c009ca7a8858ebf582e194e5dc52d58
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
