Merge "InstantCommons: do not cache thumbs"

diff --combined includes/Setup.php
index ecd164d,c452779..01ba1e8
--- 1/includes/Setup.php
--- 2/includes/Setup.php
+++ b/includes/Setup.php
@@@ -1,6 -1,6 +1,6 @@@
  <?php
  /**
 - * Include most things that are needed to make %MediaWiki work.
 + * Include most things that are needed to make MediaWiki work.
   *
   * This file is included by WebStart.php and doMaintenance.php so that both
   * web and maintenance scripts share a final set up phase to include necessary
@@@ -36,10 -36,8 +36,10 @@@ if ( !defined( 'MEDIAWIKI' ) ) 
  $fname = 'Setup.php';
  $ps_setup = Profiler::instance()->scopedProfileIn( $fname );
  
 -// If any extensions are still queued, force load them
 +// Load queued extensions
  ExtensionRegistry::getInstance()->loadFromQueue();
 +// Don't let any other extensions load
 +ExtensionRegistry::getInstance()->finish();
  
  // Check to see if we are at the file scope
  if ( !isset( $wgVersion ) ) {
@@@ -244,7 -242,7 +244,7 @@@ if ( $wgUseInstantCommons ) 
                'transformVia404' => true,
                'fetchDescription' => true,
                'descriptionCacheExpiry' => 43200,
-               'apiThumbCacheExpiry' => 86400,
+               'apiThumbCacheExpiry' => 0,
        ];
  }
  /*
@@@ -499,6 -497,10 +499,6 @@@ if ( $wgDebugToolbar && !$wgCommandLine
        MWDebug::init();
  }
  
 -if ( !class_exists( 'AutoLoader' ) ) {
 -      require_once "$IP/includes/AutoLoader.php";
 -}
 -
  // Reset the global service locator, so any services that have already been created will be
  // re-created while taking into account any custom settings and extensions.
  MediaWikiServices::resetGlobalInstance( new GlobalVarConfig(), 'quick' );
@@@ -876,6 -878,7 +876,6 @@@ if ( !$wgCommandLineMode ) 
        Pingback::schedulePingback();
  }
  
 -wfDebug( "Fully initialised\n" );
  $wgFullyInitialised = true;
  
  Profiler::instance()->scopedProfileOut( $ps_extensions );