jenkins-bot has submitted this change and it was merged.
Change subject: Remove the feedback link from the flyout - no longer needed
......................................................................
Remove the feedback link from the flyout - no longer needed
Change-Id: I0531fdd126c3030097b5485b1140c66fc6306ae0
---
M Echo.php
M Hooks.php
M special/SpecialNotifications.php
3 files changed, 0 insertions(+), 8 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Echo.php b/Echo.php
index 59cc268..a16ddbc 100755
--- a/Echo.php
+++ b/Echo.php
@@ -246,9 +246,6 @@
// URL for more information about the Echo notification system
$wgEchoHelpPage =
'//www.mediawiki.org/wiki/Special:MyLanguage/Help:Extension:Echo';
-// URL for a feedback/survey page
-$wgEchoFeedbackPage = '//www.surveymonkey.com/s/notifications1';
-
// Whether to use job queue to process web and email notifications, bypass the
queue for now
// since it's taking more than an hour to run in mediawiki.org, this is not
acceptable for the
// purpose of testing notification.
diff --git a/Hooks.php b/Hooks.php
index 8ebf8b6..fea04a8 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -622,13 +622,10 @@
}
if ( $user->isLoggedIn() && $user->getOption(
'echo-notify-show-link' ) ) {
- global $wgEchoFeedbackPage;
// Load the module for the Notifications flyout
$out->addModules( array( 'ext.echo.overlay' ) );
// Load the styles for the Notifications badge
$out->addModuleStyles( 'ext.echo.badge' );
- // Pass needed global vars to the client
- $out->addJsConfigVars( array( 'wgEchoFeedbackPage' =>
$wgEchoFeedbackPage ) );
}
if ( $wgEchoNewMsgAlert && $user->isLoggedIn() &&
$user->getOption( 'echo-show-alert' ) ) {
$out->addModules( array( 'ext.echo.alert' ) );
diff --git a/special/SpecialNotifications.php b/special/SpecialNotifications.php
index 5b48eea..9d4b015 100644
--- a/special/SpecialNotifications.php
+++ b/special/SpecialNotifications.php
@@ -12,7 +12,6 @@
}
public function execute( $par ) {
- global $wgEchoFeedbackPage;
$this->setHeaders();
@@ -97,7 +96,6 @@
array(
'wgEchoDisplayNum' => self::$displayNum,
'wgEchoNextContinue' => $nextContinue,
- 'wgEchoFeedbackPage' => $wgEchoFeedbackPage,
'wgEchoDateHeader' => $dateHeader
)
);
--
To view, visit https://gerrit.wikimedia.org/r/69961
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0531fdd126c3030097b5485b1140c66fc6306ae0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
