Merge "Allow blacklisting certain namespaces in Special:ShortPages"

diff --combined includes/DefaultSettings.php
index aa4320d,9fb29fd..b6d75ce
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3754,18 -3754,20 +3754,18 @@@ $wgResourceLoaderValidateStaticJS = fal
   * at the beginning of all your .less files, with all the consequences.
   * In particular, string values must be escaped and quoted.
   *
 - * Changes to LESS variables do not trigger cache invalidation.
 - *
 - * If the LESS variables need to be dynamic, you can use the
 - * ResourceLoaderGetLessVars hook (since 1.25).
 + * Changes to this configuration do NOT trigger cache invalidation.
   *
   * @par Example:
   * @code
   *   $wgResourceLoaderLESSVars = [
 - *     'baseFontSize'  => '1em',
 - *     'smallFontSize' => '0.75em',
 - *     'WikimediaBlue' => '#006699',
 + *     'exampleFontSize'  => '1em',
 + *     'exampleBlue' => '#eee',
   *   ];
   * @endcode
   * @since 1.22
 + * @deprecated since 1.30 Use ResourceLoaderModule::getLessVars() instead to
 + *  add variables to individual modules that need them.
   */
  $wgResourceLoaderLESSVars = [
        /**
@@@ -4089,6 -4091,13 +4089,13 @@@ $wgTrackingCategories = []
   */
  $wgContentNamespaces = [ NS_MAIN ];
  
+ /**
+  * Optional array of namespaces which should be blacklisted from Special:ShortPages
+  * Only pages inside $wgContentNamespaces but not $wgShortPagesNamespaceBlacklist will
+  * be shown on that page.
+  */
+ $wgShortPagesNamespaceBlacklist = [];
+ 
  /**
   * Array of namespaces, in addition to the talk namespaces, where signatures
   * (~~~~) are likely to be used. This determines whether to display the
@@@ -6769,6 -6778,11 +6776,6 @@@ $wgRCWatchCategoryMembership = false
   */
  $wgUseRCPatrol = true;
  
 -/**
 - * Whether to allow users to save their RecentChanges filters
 - */
 -$wgStructuredChangeFiltersEnableSaving = true;
 -
  /**
   * Whether to show the new experimental views (like namespaces, tags, and users) in
   * RecentChanges filters