Do not support new installations via .php5 entrypoint any longer

[lhc/web/wiklou.git] / thumb.php

diff --git a/thumb.php b/thumb.php
index 70cd1e6..051c39e 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -35,11 +35,8 @@ if ( defined( 'THUMB_HANDLER' ) ) {
        wfStreamThumb( $_GET );
 }
 
-wfLogProfilingData();
-// Commit and close up!
-$factory = wfGetLBFactory();
-$factory->commitMasterChanges();
-$factory->shutdown();
+$mediawiki = new MediaWiki();
+$mediawiki->doPostOutputShutdown( 'fast' );
 
 //--------------------------------------------------------------------------
 
@@ -305,7 +302,10 @@ function wfStreamThumb( array $params ) {
        // Stream the file if it exists already...
        $thumbPath = $img->getThumbPath( $thumbName );
        if ( $img->getRepo()->fileExists( $thumbPath ) ) {
-               $img->getRepo()->streamFile( $thumbPath, $headers );
+               $success = $img->getRepo()->streamFile( $thumbPath, $headers );
+               if ( !$success ) {
+                       wfThumbError( 500, 'Could not stream the file' );
+               }
                return;
        }
 
@@ -320,6 +320,7 @@ function wfStreamThumb( array $params ) {
 
        // Actually generate a new thumbnail
        list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
+       /** @var MediaTransformOutput|bool $thumb */
 
        // Check for thumbnail generation errors...
        $msg = wfMessage( 'thumbnail_error' );
@@ -340,7 +341,10 @@ function wfStreamThumb( array $params ) {
                wfThumbError( $errorCode, $errorMsg );
        } else {
                // Stream the file if there were no errors
-               $thumb->streamFile( $headers );
+               $success = $thumb->streamFile( $headers );
+               if ( !$success ) {
+                       wfThumbError( 500, 'Could not stream the file' );
+               }
        }
 }
 
@@ -495,7 +499,7 @@ function wfExtractThumbParams( $file, $params ) {
        unset( $params['thumbName'] );
 
        // Do the hook first for older extensions that rely on it.
-       if ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
+       if ( !Hooks::run( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
                // Check hooks if parameters can be extracted
                // Hooks return false if they manage to *resolve* the parameters
                // This hook should be considered deprecated