Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made sure MediaTransformOutput::getLocalCopyPath handles storage paths.

Browse source 
* Storage paths are passed in for several cases in File::transform().

Change-Id: I61a4058b80a37f36b78e2dfe62ffdf6f73e6f41e
This commit is contained in:
Aaron Schulz 2013-03-27 12:48:08 -07:00
parent b3c718f6ae
commit cfe057a603
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/filerepo/file/File.php
View file

@ -910,8 +910,7 @@ abstract class File {
// XXX: Pass in the storage path even though we are not rendering anything // XXX: Pass in the storage path even though we are not rendering anything
// and the path is supposed to be an FS path. This is due to getScalerType() // and the path is supposed to be an FS path. This is due to getScalerType()
// getting called on the path and clobbering $thumb->getUrl() if it's false. // getting called on the path and clobbering $thumb->getUrl() if it's false.
$thumb = $handler->getTransform( $thumb = $handler->getTransform( $this, $thumbPath, $thumbUrl, $params );
$this, $thumbPath, $thumbUrl, $params );
$thumb->setStoragePath( $thumbPath ); $thumb->setStoragePath( $thumbPath );
break; break;
} }

7
includes/media/MediaTransformOutput.php
View file

@ -151,7 +151,12 @@ abstract class MediaTransformOutput {
if ( $this->isError() ) { if ( $this->isError() ) {
return false; return false;
} elseif ( $this->path === null ) { } elseif ( $this->path === null ) {
return $this->file->getLocalRefPath(); return $this->file->getLocalRefPath(); // assume thumb was not scaled
} elseif ( FileBackend::isStoragePath( $this->path ) ) {
$be = $this->file->getRepo()->getBackend();
// The temp file will be process cached by FileBackend
$fsFile = $be->getLocalReference( array( 'src' => $this->path ) );
return $fsFile ? $fsFile->getPath() : false;
} else { } else {
return $this->path; // may return false return $this->path; // may return false
} }