Merge "Hard deprecate MWNamespace::canTalk()"

[lhc/web/wiklou.git] / includes / specials / SpecialWatchlist.php

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 0ca6f93..7772ef7 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -102,11 +102,6 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 
                if ( $this->isStructuredFilterUiEnabled() ) {
                        $output->addModuleStyles( [ 'mediawiki.rcfilters.highlightCircles.seenunseen.styles' ] );
-
-                       $output->addJsConfigVars(
-                               'wgStructuredChangeFiltersEditWatchlistUrl',
-                               SpecialPage::getTitleFor( 'EditWatchlist' )->getLocalURL()
-                       );
                }
        }
 
@@ -155,7 +150,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
                                        'activeValue' => false,
                                        'default' => $this->getUser()->getBoolOption( 'extendwatchlist' ),
                                        'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables,
-                                                                                                 &$fields, &$conds, &$query_options, &$join_conds ) {
+                                                       &$fields, &$conds, &$query_options, &$join_conds ) {
                                                $nonRevisionTypes = [ RC_LOG ];
                                                Hooks::run( 'SpecialWatchlistGetNonRevisionTypes', [ &$nonRevisionTypes ] );
                                                if ( $nonRevisionTypes ) {
@@ -211,7 +206,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
                        ],
                        'default' => ChangesListStringOptionsFilterGroup::NONE,
                        'queryCallable' => function ( $specialPageClassName, $context, $dbr,
-                                                                                 &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) {
+                                       &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) {
                                if ( $selectedValues === [ 'seen' ] ) {
                                        $conds[] = $dbr->makeList( [
                                                'wl_notificationtimestamp IS NULL',
@@ -463,7 +458,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
                $services = MediaWikiServices::getInstance();
 
                # Show a message about replica DB lag, if applicable
-               $lag = $services->getDBLoadBalancer()->safeGetLag( $dbr );
+               $lag = $dbr->getSessionLagStatus()['lag'];
                if ( $lag > 0 ) {
                        $output->showLagWarning( $lag );
                }