Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/286943
Change subject: Rename MentionPresentationModel::getType() to avoid conflict
with I4eceaf521315
......................................................................
Rename MentionPresentationModel::getType() to avoid conflict with I4eceaf521315
Change-Id: I0ad0edd50ad56a0e63078b2906918853de5c26d0
---
M includes/Notifications/MentionPresentationModel.php
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/43/286943/1
diff --git a/includes/Notifications/MentionPresentationModel.php
b/includes/Notifications/MentionPresentationModel.php
index 8ea4a59..e14d41a 100644
--- a/includes/Notifications/MentionPresentationModel.php
+++ b/includes/Notifications/MentionPresentationModel.php
@@ -19,9 +19,9 @@
);
// override url, link straight to that specific post/topic
- if ( $this->getType() === 'post' ) {
+ if ( $this->getMentionType() === 'post' ) {
$link['url'] = $this->getPostLinkUrl();
- } elseif ( $this->getType() === 'post-summary' ) {
+ } elseif ( $this->getMentionType() === 'post-summary' ) {
$link['url'] = $this->getTopicLinkUrl();
}
@@ -36,7 +36,7 @@
}
public function getHeaderMessageKey() {
- return parent::getHeaderMessageKey() . '-' . $this->getType();
+ return parent::getHeaderMessageKey() . '-' .
$this->getMentionType();
}
public function getHeaderMessage() {
@@ -44,7 +44,7 @@
$msg->params( $this->getTruncatedTitleText(
$this->event->getTitle(), true) );
$msg->params( $this->getViewingUserForGender() );
- if ( in_array( $this->getType(), array( 'post', 'post-summary'
) ) ) {
+ if ( in_array( $this->getMentionType(), array( 'post',
'post-summary' ) ) ) {
$msg->plaintextParams( $this->getTopicTitle() );
}
@@ -57,7 +57,7 @@
return $msg;
}
- protected function getType() {
+ protected function getMentionType() {
// we didn't use to include the type to differentiate messages,
but
// then we only supported posts
return $this->event->getExtraParam( 'revision-type', 'post' );
--
To view, visit https://gerrit.wikimedia.org/r/286943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0ad0edd50ad56a0e63078b2906918853de5c26d0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
