Merge "Setup.php: Ensure that defaults for 'rcdays' and 'watchlistdays' are not invalid"

diff --combined includes/Setup.php
index f6c546f,9e4d2a3..2723258
--- 1/includes/Setup.php
--- 2/includes/Setup.php
+++ b/includes/Setup.php
@@@ -264,6 -264,7 +264,7 @@@ foreach ( $wgForeignFileRepos as &$rep
  }
  unset( $repo ); // no global pollution; destroy reference
  
+ $rcMaxAgeDays = $wgRCMaxAge / ( 3600 * 24 );
  if ( $wgRCFilterByAge ) {
        // Trim down $wgRCLinkDays so that it only lists links which are valid
        // as determined by $wgRCMaxAge.
@@@ -273,12 -274,22 +274,22 @@@
        // @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
        for ( $i = 0; $i < count( $wgRCLinkDays ); $i++ ) {
                // @codingStandardsIgnoreEnd
-               if ( $wgRCLinkDays[$i] >= $wgRCMaxAge / ( 3600 * 24 ) ) {
+               if ( $wgRCLinkDays[$i] >= $rcMaxAgeDays ) {
                        $wgRCLinkDays = array_slice( $wgRCLinkDays, 0, $i + 1, false );
                        break;
                }
        }
  }
+ // Ensure that default user options are not invalid, since that breaks Special:Preferences
+ $wgDefaultUserOptions['rcdays'] = min(
+       $wgDefaultUserOptions['rcdays'],
+       ceil( $rcMaxAgeDays )
+ );
+ $wgDefaultUserOptions['watchlistdays'] = min(
+       $wgDefaultUserOptions['watchlistdays'],
+       ceil( $rcMaxAgeDays )
+ );
+ unset( $rcMaxAgeDays );
  
  if ( $wgSkipSkin ) {
        $wgSkipSkins[] = $wgSkipSkin;
@@@ -606,13 -617,15 +617,13 @@@ if ( !$wgDBerrorLogTZ ) 
        $wgDBerrorLogTZ = $wgLocaltimezone;
  }
  
 +// initialize the request object in $wgRequest
 +$wgRequest = RequestContext::getMain()->getRequest(); // BackCompat
 +
  // Useful debug output
  if ( $wgCommandLineMode ) {
 -      $wgRequest = new FauxRequest( array() );
 -
        wfDebug( "\n\nStart command line script $self\n" );
  } else {
 -      // Can't stub this one, it sets up $_GET and $_REQUEST in its constructor
 -      $wgRequest = new WebRequest;
 -
        $debug = "\n\nStart request {$wgRequest->getMethod()} {$wgRequest->getRequestURL()}\n";
  
        if ( $wgDebugPrintHttpHeaders ) {