Merge "Remove the feedback link from the flyout - no longer needed"

This commit is contained in:
jenkins-bot 2013-07-12 23:53:57 +00:00 committed by Gerrit Code Review
commit df4a3b374d
3 changed files with 0 additions and 8 deletions

View file

@ -246,9 +246,6 @@ $wgEchoEnableEmailBatch = true;
// 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.

View file

@ -622,13 +622,10 @@ class EchoHooks {
}
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' ) );

View file

@ -12,7 +12,6 @@ class SpecialNotifications extends SpecialPage {
}
public function execute( $par ) {
global $wgEchoFeedbackPage;
$this->setHeaders();
@ -97,7 +96,6 @@ class SpecialNotifications extends SpecialPage {
array(
'wgEchoDisplayNum' => self::$displayNum,
'wgEchoNextContinue' => $nextContinue,
'wgEchoFeedbackPage' => $wgEchoFeedbackPage,
'wgEchoDateHeader' => $dateHeader
)
);