From: Aaron Schulz <aschulz@wikimedia.org>
Date: Sat, 20 Apr 2019 03:13:49 +0000 (-0700)
Subject: filerepo: fix return type of FileRepo::streamFileWithStatus()
X-Git-Tag: 1.34.0-rc.0~1913
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=84fbe50b535eaa961d7dc92149095b7e8f19acbb;p=lhc%2Fweb%2Fwiklou.git

filerepo: fix return type of FileRepo::streamFileWithStatus()

Change-Id: Ibb4610630203e22d921189699f6c51298212d5d3
---

diff --git a/includes/media/MediaTransformOutput.php b/includes/media/MediaTransformOutput.php
index 9c06ef421c..463a7948d9 100644
--- a/includes/media/MediaTransformOutput.php
+++ b/includes/media/MediaTransformOutput.php
@@ -202,7 +202,8 @@ abstract class MediaTransformOutput {
 			return Status::newFatal( 'backend-fail-stream', '<no path>' );
 		} elseif ( FileBackend::isStoragePath( $this->path ) ) {
 			$be = $this->file->getRepo()->getBackend();
-			return $be->streamFile( [ 'src' => $this->path, 'headers' => $headers ] );
+			return Status::wrap(
+				$be->streamFile( [ 'src' => $this->path, 'headers' => $headers ] ) );
 		} else { // FS-file
 			$success = StreamFile::stream( $this->getLocalCopyPath(), $headers );
 			return $success ? Status::newGood() : Status::newFatal( 'backend-fail-stream', $this->path );