Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/200852
Change subject: Fix missing var $type
......................................................................
Fix missing var $type
It was declared only after it could already be used.
Also, AbstractRevision::getType doesn't exist, changed to
getRevisionType
Change-Id: Ie2c59ceab89a34801475e2b714377f225837dcbf
---
M includes/Block/Topic.php
1 file changed, 14 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/52/200852/1
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 0c02290..5f60708 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -820,6 +820,20 @@
$state = $revision->getModerationState();
+ // display simple message
+ // i18n messages:
+ // flow-error-not-allowed-hide,
+ // flow-error-not-allowed-reply-to-hide-topic
+ // flow-error-not-allowed-delete
+ // flow-error-not-allowed-reply-to-delete-topic
+ // flow-error-not-allowed-suppress
+ // flow-error-not-allowed-reply-to-suppress-topic
+ if ( $revision instanceof PostRevision ) {
+ $type = $revision->isTopicTitle() ? 'topic' : 'post';
+ } else {
+ $type = $revision->getRevisionType();
+ }
+
// Show a snippet of the relevant log entry if available.
if ( \LogPage::isLogType( $state ) ) {
// check if user has sufficient permissions to see log
@@ -860,19 +874,6 @@
}
}
- // display simple message
- // i18n messages:
- // flow-error-not-allowed-hide,
- // flow-error-not-allowed-reply-to-hide-topic
- // flow-error-not-allowed-delete
- // flow-error-not-allowed-reply-to-delete-topic
- // flow-error-not-allowed-suppress
- // flow-error-not-allowed-reply-to-suppress-topic
- if ( $revision instanceof PostRevision ) {
- $type = $revision->isTopicTitle() ? 'topic' : 'post';
- } else {
- $type = $revision->getType();
- }
return $this->context->msg( array(
// set of keys to try in order
"flow-error-not-allowed-{$this->action}-to-$state-$type",
--
To view, visit https://gerrit.wikimedia.org/r/200852
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie2c59ceab89a34801475e2b714377f225837dcbf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
