jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Allow delete link in menu"
......................................................................
Revert "Allow delete link in menu"
We don't want to show it until we fix the issues (T90077).
This reverts commit 90893a37aa33f4bbe41e20f8bde141091419403b.
Change-Id: I476f14196c0ee4025681e1ba1b76ca966e68bae6
---
M Flow.php
M Hooks.php
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Flow.php b/Flow.php
index 9dbe14f..fdc1f25 100644
--- a/Flow.php
+++ b/Flow.php
@@ -300,8 +300,8 @@
$wgFlowAbuseFilterEmergencyDisableCount = 50;
$wgFlowAbuseFilterEmergencyDisableAge = 86400; // One day.
-// Actions that must pass through to MediaWiki on Flow-enabled pages
-$wgFlowCoreActionWhitelist = array( 'info', 'protect', 'unprotect', 'unwatch',
'watch', 'history', 'delete', 'wikilove' );
+// Actions that must pass through to MediaWiki on flow enabled pages
+$wgFlowCoreActionWhitelist = array( 'info', 'protect', 'unprotect', 'unwatch',
'watch', 'history', 'wikilove' );
// When set to true Flow will compile templates into their intermediate forms
// on every run. When set to false Flow will use the versions already written
diff --git a/Hooks.php b/Hooks.php
index e44868e..43080da 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -450,11 +450,10 @@
// FIXME: Find more elegant standard way of doing this.
$wgMFPageActions = array();
- // watch star & delete links are inside the topic itself
+ // watch star links are inside the topic itself
if ( $title->getNamespace() === NS_TOPIC ) {
unset( $links['actions']['watch'] );
unset( $links['actions']['unwatch'] );
- unset( $links['actions']['delete'] );
}
// hide all views unless whitelisted
--
To view, visit https://gerrit.wikimedia.org/r/197679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I476f14196c0ee4025681e1ba1b76ca966e68bae6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: SG <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
