jenkins-bot has submitted this change and it was merged.
Change subject: Reorder UserEditFilterGenerator in right place ......................................................................
Reorder UserEditFilterGenerator in right place
synchronized with core
Change-Id: I46e88b7e0313c0f1c4560b74c2c9208b828868fc --- M template.py 1 file changed, 2 insertions(+), 3 deletions(-)
Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified
diff --git a/template.py b/template.py index f75797e..d284a22 100644 --- a/template.py +++ b/template.py @@ -351,8 +351,6 @@
if xmlfilename: gen = XmlDumpTemplatePageGenerator(oldTemplates, xmlfilename) - elif user: - gen = UserEditFilterGenerator(gen, user, timestamp, skip) else: gen = genFactory.getCombinedGenerator() if not gen: @@ -362,7 +360,8 @@ ] gen = pagegenerators.CombinedPageGenerator(gens) gen = pagegenerators.DuplicateFilterPageGenerator(gen) - + if user: + gen = UserEditFilterGenerator(gen, user, timestamp, skip) preloadingGen = pagegenerators.PreloadingGenerator(gen)
bot = TemplateRobot(preloadingGen, templates, subst, remove, editSummary,
pywikibot-commits@lists.wikimedia.org