const FOR_THIS_USER = 2;
const RAW = 3;
- // Options for File::thumbName()
- const THUMB_FULL_NAME = 1;
-
/**
* Some member variables can be lazy-initialised using __get(). The
* initialisation function for these variables is always a function named
}
/**
- * Return the file name of a thumbnail with the specified parameters.
- * Use File::THUMB_FULL_NAME to always get a name like "<params>-<source>".
- * Otherwise, the format may be "<params>-<source>" or "<params>-thumbnail.<ext>".
+ * Return the file name of a thumbnail with the specified parameters
*
* @param $params Array: handler-specific parameters
- * @param $flags integer Bitfield that supports THUMB_* constants
+ * @private -ish
+ *
* @return string
*/
- public function thumbName( $params, $flags = 0 ) {
- $name = ( $this->repo && !( $flags & self::THUMB_FULL_NAME ) )
- ? $this->repo->nameForThumb( $this->getName() )
- : $this->getName();
+ function thumbName( $params ) {
+ $name = $this->repo ? $this->repo->nameForThumb( $this->getName() ) : $this->getName();
return $this->generateThumbName( $name, $params );
}
*
* @return string
*/
- public function generateThumbName( $name, $params ) {
+ function generateThumbName( $name, $params ) {
if ( !$this->getHandler() ) {
return null;
}
// Stream the file if it exists already...
try {
- $thumbName2 = $img->thumbName( $params, File::THUMB_FULL_NAME ); // b/c; "long" style
// For 404 handled thumbnails, we only use the the base name of the URI
// for the thumb params and the parent directory for the source file name.
// Check that the zone relative path matches up so squid caches won't pick
// up thumbs that would not be purged on source file deletion (bug 34231).
- if ( isset( $params['rel404'] ) ) { // thumbnail was handled via 404
- if ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName ) ) {
- // Normal request for the canonical thumbnail name
- } elseif ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName2 ) ) {
- // Generate the thumb under the "long" name (so it can be purged)
- $thumbName = $thumbName2; // b/c
- } else {
- wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
- wfProfileOut( __METHOD__ );
- return;
- }
+ if ( isset( $params['rel404'] ) // thumbnail was handled via 404
+ && urldecode( $params['rel404'] ) !== $img->getThumbRel( $thumbName ) )
+ {
+ wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+ wfProfileOut( __METHOD__ );
+ return;
}
$thumbPath = $img->getThumbPath( $thumbName );
if ( $img->getRepo()->fileExists( $thumbPath ) ) {