jenkins-bot has submitted this change and it was merged.
Change subject: Fixup a few more getContent() calls
......................................................................
Fixup a few more getContent() calls
Change-Id: I3f2c42f33ba6bcb8b0bcc0240b616ec114976837
---
M api/ApiFeedLQTThreads.php
M classes/NewMessagesController.php
M classes/View.php
M pages/TalkpageView.php
4 files changed, 15 insertions(+), 8 deletions(-)
Approvals:
Nikerabbit: Looks good to me, approved
jenkins-bot: Verified
diff --git a/api/ApiFeedLQTThreads.php b/api/ApiFeedLQTThreads.php
index 7c4dce7..37882d0 100644
--- a/api/ApiFeedLQTThreads.php
+++ b/api/ApiFeedLQTThreads.php
@@ -76,7 +76,7 @@
$thread = Thread::newFromRow( $row );
$titleStr = $thread->subject();
- $completeText = $thread->root()->getContent();
+ $completeText = ContentHandler::getContentText(
$thread->root()->getPage()->getContent() );
$completeText = $this->getOutput()->parse( $completeText );
$threadTitle = clone $thread->topmostThread()->title();
$threadTitle->setFragment( '#' . $thread->getAnchorName() );
diff --git a/classes/NewMessagesController.php
b/classes/NewMessagesController.php
index 6b76fd8..93635d2 100644
--- a/classes/NewMessagesController.php
+++ b/classes/NewMessagesController.php
@@ -322,11 +322,16 @@
$date = $lang->date( $adjustedTimestamp );
$time = $lang->time( $adjustedTimestamp );
- $params = array( $u->getName(),
$t->subjectWithoutIncrement(),
- $date, $time, $talkPage,
- $permalink,
- $t->root()->getContent(),
- $t->author()->getName() );
+ $params = array(
+ $u->getName(),
+ $t->subjectWithoutIncrement(),
+ $date,
+ $time,
+ $talkPage,
+ $permalink,
+ ContentHandler::getContentText(
$t->root()->getPage()->getContent() ),
+ $t->author()->getName()
+ );
// Get message in user's own language, bug 20645
$msg = wfMessage( $msgName, $params )->inLanguage(
$langCode )->text();
diff --git a/classes/View.php b/classes/View.php
index 1a75004..0541b34 100644
--- a/classes/View.php
+++ b/classes/View.php
@@ -1903,7 +1903,9 @@
foreach ( $replies as $reply ) {
$content = '';
- if ( $reply->root() ) $content =
$reply->root()->getContent();
+ if ( $reply->root() ) {
+ $content = ContentHandler::getContentText(
$reply->root()->getPage()->getContent() );
+ }
if ( trim( $content ) != '' ) {
return true;
diff --git a/pages/TalkpageView.php b/pages/TalkpageView.php
index f48c494..a3c91ec 100644
--- a/pages/TalkpageView.php
+++ b/pages/TalkpageView.php
@@ -121,7 +121,7 @@
// Table body
$rows = array();
foreach ( $threads as $thread ) {
- if ( $thread->root() && !$thread->root()->getContent()
&&
+ if ( $thread->root() &&
!$thread->root()->getPage()->getContent() &&
!LqtView::threadContainsRepliesWithContent(
$thread ) ) {
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/317844
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f2c42f33ba6bcb8b0bcc0240b616ec114976837
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LiquidThreads
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
