jenkins-bot has submitted this change and it was merged.
Change subject: Fix new page creation with selective serialization enabled
......................................................................
Fix new page creation with selective serialization enabled
There is no point in retrieving an old revision for selective serialization if
we did not get an oldid passed in. This patch switches to full serialization
in that case without attempting to fetch the page source.
Error handlign in the getPageSrc helper is also slightly improved by checking
for the revision member first.
Change-Id: I2344e2106303c751a850fa9d296975dd844015d5
---
M js/lib/mediawiki.SelectiveSerializer.js
M js/lib/mediawiki.Util.js
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/mediawiki.SelectiveSerializer.js
b/js/lib/mediawiki.SelectiveSerializer.js
index 18e19e2..6f96a95 100644
--- a/js/lib/mediawiki.SelectiveSerializer.js
+++ b/js/lib/mediawiki.SelectiveSerializer.js
@@ -176,12 +176,15 @@
} else if ( this.env.page.src ) {
// Have the src, only parse the src to the dom
this.parseOriginalSource( doc, cb, finalcb, null,
this.env.page.src );
- } else {
+ } else if (this.env.page.id) {
// Start by getting the old text of this page
Util.getPageSrc( this.env, this.env.page.name,
this.parseOriginalSource.bind(this, doc, cb,
finalcb),
this.env.page.id || null );
+ } else {
+ this.doSerializeDOM(null, doc, cb, finalcb);
}
+
};
if ( typeof module === 'object' ) {
diff --git a/js/lib/mediawiki.Util.js b/js/lib/mediawiki.Util.js
index ecaf3b3..346ee98 100644
--- a/js/lib/mediawiki.Util.js
+++ b/js/lib/mediawiki.Util.js
@@ -1282,7 +1282,7 @@
title = env.resolveTitle( title, '' );
var pageRequest = new TemplateRequest( env, title, oldid );
pageRequest.once( 'src', function(err, page) {
- cb(err, page ? page.revision['*'] : null);
+ cb(err, page && page.revision ? page.revision['*'] : null);
});
};
--
To view, visit https://gerrit.wikimedia.org/r/60026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2344e2106303c751a850fa9d296975dd844015d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: 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
