Merge "mw.widgets.visibleLengthLimit: Apply number conversion to the limit"

[lhc/web/wiklou.git] / includes / preferences / DefaultPreferencesFactory.php

diff --git a/includes/preferences/DefaultPreferencesFactory.php b/includes/preferences/DefaultPreferencesFactory.php
index b2b68d2..3bc21f7 100644 (file)
--- a/includes/preferences/DefaultPreferencesFactory.php
+++ b/includes/preferences/DefaultPreferencesFactory.php
@@ -45,6 +45,8 @@ use MWTimestamp;
 use Parser;
 use ParserOptions;
 use PreferencesForm;
+use Psr\Log\LoggerAwareTrait;
+use Psr\Log\NullLogger;
 use Skin;
 use SpecialPage;
 use Status;
@@ -57,6 +59,7 @@ use Xml;
  * This is the default implementation of PreferencesFactory.
  */
 class DefaultPreferencesFactory implements PreferencesFactory {
+       use LoggerAwareTrait;
 
        /** @var Config */
        protected $config;
@@ -86,6 +89,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                $this->contLang = $contLang;
                $this->authManager = $authManager;
                $this->linkRenderer = $linkRenderer;
+               $this->logger = new NullLogger();
        }
 
        /**
@@ -137,6 +141,7 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                Hooks::run( 'GetPreferences', [ $user, &$preferences ] );
 
                $this->loadPreferenceValues( $user, $context, $preferences );
+               $this->logger->debug( "Created form descriptor for user '{$user->getName()}'" );
                return $preferences;
        }
 
@@ -1183,18 +1188,16 @@ class DefaultPreferencesFactory implements PreferencesFactory {
                        }
                }
 
-               if ( $this->config->get( 'EnableAPI' ) ) {
-                       $defaultPreferences['watchlisttoken'] = [
-                               'type' => 'api',
-                       ];
-                       $defaultPreferences['watchlisttoken-info'] = [
-                               'type' => 'info',
-                               'section' => 'watchlist/tokenwatchlist',
-                               'label-message' => 'prefs-watchlist-token',
-                               'default' => $user->getTokenFromOption( 'watchlisttoken' ),
-                               'help-message' => 'prefs-help-watchlist-token2',
-                       ];
-               }
+               $defaultPreferences['watchlisttoken'] = [
+                       'type' => 'api',
+               ];
+               $defaultPreferences['watchlisttoken-info'] = [
+                       'type' => 'info',
+                       'section' => 'watchlist/tokenwatchlist',
+                       'label-message' => 'prefs-watchlist-token',
+                       'default' => $user->getTokenFromOption( 'watchlisttoken' ),
+                       'help-message' => 'prefs-help-watchlist-token2',
+               ];
        }
 
        /**