jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING] Allow HTML in DiffFormatterUtils::createHeader()
......................................................................
[BREAKING] Allow HTML in DiffFormatterUtils::createHeader()
Follow-up to commit 98a502c52414636c3928194cb0023a54e2514795
Change-Id: I9190f67b846ab6fd698e4b5c10c36907ee72e0ad
---
M includes/DiffFormatterUtils.php
M includes/page/PageDifferenceEngine.php
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/DiffFormatterUtils.php b/includes/DiffFormatterUtils.php
index 3aa4a23..9268936 100644
--- a/includes/DiffFormatterUtils.php
+++ b/includes/DiffFormatterUtils.php
@@ -14,13 +14,13 @@
/**
* Create an header in the two columns
*
- * @param $text string the header text
+ * @param $text string the header HTML
* @return string
*/
public function createHeader( $text ) {
return Html::openElement( 'tr' ) .
- Html::element( 'td', array( 'colspan' => '2', 'class'
=> 'diff-lineno' ), $text ) .
- Html::element( 'td', array( 'colspan' => '2', 'class'
=> 'diff-lineno' ), $text ) .
+ Html::rawElement( 'td', array( 'colspan' => '2',
'class' => 'diff-lineno' ), $text ) .
+ Html::rawElement( 'td', array( 'colspan' => '2',
'class' => 'diff-lineno' ), $text ) .
Html::closeElement( 'tr' );
}
diff --git a/includes/page/PageDifferenceEngine.php
b/includes/page/PageDifferenceEngine.php
index 26cd4ab..1553c76 100644
--- a/includes/page/PageDifferenceEngine.php
+++ b/includes/page/PageDifferenceEngine.php
@@ -68,6 +68,6 @@
return '';
}
- return $this->diffFormatterUtils->createHeader( $this->msg(
$headerMsg )->text() ) . $diff;
+ return $this->diffFormatterUtils->createHeader( $this->msg(
$headerMsg )->escaped() ) . $diff;
}
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/286268
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9190f67b846ab6fd698e4b5c10c36907ee72e0ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
