Merge "Avoid attempting to prerender thumbnails that will fail"

diff --combined includes/upload/UploadBase.php
index b3404dc,db0239c..079c7f8
--- 1/includes/upload/UploadBase.php
--- 2/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@@ -69,6 -69,8 +69,6 @@@ abstract class UploadBase 
        const WINDOWS_NONASCII_FILENAME = 13;
        const FILENAME_TOO_LONG = 14;
  
 -      const SESSION_STATUS_KEY = 'wsUploadStatusData';
 -
        /**
         * @param int $error
         * @return string
@@@ -766,13 -768,20 +766,20 @@@
                $sizes = $wgUploadThumbnailRenderMap;
                rsort( $sizes );
  
+               $file = $this->getLocalFile();
+ 
                foreach ( $sizes as $size ) {
-                       $jobs[] = new ThumbnailRenderJob( $this->getLocalFile()->getTitle(), array(
-                               'transformParams' => array( 'width' => $size ),
-                       ) );
+                       if ( $file->isVectorized()
+                               || $file->getWidth() > $size ) {
+                                       $jobs[] = new ThumbnailRenderJob( $file->getTitle(), array(
+                                               'transformParams' => array( 'width' => $size ),
+                                       ) );
+                       }
                }
  
-               JobQueueGroup::singleton()->push( $jobs );
+               if ( $jobs ) {
+                       JobQueueGroup::singleton()->push( $jobs );
+               }
        }
  
        /**
@@@ -1977,38 -1986,29 +1984,38 @@@
        }
  
        /**
 -       * Get the current status of a chunked upload (used for polling).
 -       * The status will be read from the *current* user session.
 +       * Get the current status of a chunked upload (used for polling)
 +       *
 +       * The value will be read from cache.
 +       *
 +       * @param User $user
         * @param string $statusKey
         * @return Status[]|bool
         */
 -      public static function getSessionStatus( $statusKey ) {
 -              return isset( $_SESSION[self::SESSION_STATUS_KEY][$statusKey] )
 -                      ? $_SESSION[self::SESSION_STATUS_KEY][$statusKey]
 -                      : false;
 +      public static function getSessionStatus( User $user, $statusKey ) {
 +              $key = wfMemcKey( 'uploadstatus', $user->getId() ?: md5( $user->getName() ), $statusKey );
 +
 +              return wfGetCache( CACHE_ANYTHING )->get( $key );
        }
  
        /**
 -       * Set the current status of a chunked upload (used for polling).
 -       * The status will be stored in the *current* user session.
 +       * Set the current status of a chunked upload (used for polling)
 +       *
 +       * The value will be set in cache for 1 day
 +       *
 +       * @param User $user
         * @param string $statusKey
         * @param array|bool $value
         * @return void
         */
 -      public static function setSessionStatus( $statusKey, $value ) {
 +      public static function setSessionStatus( User $user, $statusKey, $value ) {
 +              $key = wfMemcKey( 'uploadstatus', $user->getId() ?: md5( $user->getName() ), $statusKey );
 +
 +              $cache = wfGetCache( CACHE_ANYTHING );
                if ( $value === false ) {
 -                      unset( $_SESSION[self::SESSION_STATUS_KEY][$statusKey] );
 +                      $cache->delete( $key );
                } else {
 -                      $_SESSION[self::SESSION_STATUS_KEY][$statusKey] = $value;
 +                      $cache->set( $key, $value, 86400 );
                }
        }
  }