[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Use ParserOutput stateless transforms

2017-11-30 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393277 )

Change subject: Use ParserOutput stateless transforms
..


Use ParserOutput stateless transforms

Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
Change-Id: I39b599246759baad2164a29244150c99f0920684
---
M includes/SpecialConflictTestPage/HtmlPreview.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/SpecialConflictTestPage/HtmlPreview.php 
b/includes/SpecialConflictTestPage/HtmlPreview.php
index 833b95a..bd6bc94 100644
--- a/includes/SpecialConflictTestPage/HtmlPreview.php
+++ b/includes/SpecialConflictTestPage/HtmlPreview.php
@@ -51,12 +51,13 @@
 
Wikimedia\ScopedCallback::consume( $scopedCallback );
 
-   return $parseResult->getText();
+   return $parseResult->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
private function getParserOptions() {
$parserOptions = new ParserOptions();
-   $parserOptions->setEditSection( false );
$parserOptions->setIsPreview( true );
return $parserOptions;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/393277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I39b599246759baad2164a29244150c99f0920684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Anomie 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: WMDE-Fisch 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Use ParserOutput stateless transforms

2017-11-24 Thread Anomie (Code Review) 
Anomie has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393277 )

Change subject: Use ParserOutput stateless transforms
..

Use ParserOutput stateless transforms

Depends-On: I78b62ec33fcb8273acb9b3b4e9012215442be94c
Change-Id: I39b599246759baad2164a29244150c99f0920684
---
M includes/SpecialConflictTestPage/HtmlPreview.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/77/393277/1

diff --git a/includes/SpecialConflictTestPage/HtmlPreview.php 
b/includes/SpecialConflictTestPage/HtmlPreview.php
index 833b95a..bd6bc94 100644
--- a/includes/SpecialConflictTestPage/HtmlPreview.php
+++ b/includes/SpecialConflictTestPage/HtmlPreview.php
@@ -51,12 +51,13 @@
 
Wikimedia\ScopedCallback::consume( $scopedCallback );
 
-   return $parseResult->getText();
+   return $parseResult->getText( [
+   'enableSectionEditLinks' => false,
+   ] );
}
 
private function getParserOptions() {
$parserOptions = new ParserOptions();
-   $parserOptions->setEditSection( false );
$parserOptions->setIsPreview( true );
return $parserOptions;
}

-- 
To view, visit https://gerrit.wikimedia.org/r/393277
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I39b599246759baad2164a29244150c99f0920684
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Anomie 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits