if ( !is_callable( $function ) ) {
return null;
} else {
- $this->$name = call_user_func( $function );
+ $this->$name = $function();
return $this->$name;
}
function getArchiveRel( $suffix = false ) {
$path = 'archive/' . $this->getHashPath();
if ( $suffix === false ) {
- $path = substr( $path, 0, -1 );
+ $path = rtrim( $path, '/' );
} else {
$path .= $suffix;
}
* @return string
*/
function getArchiveThumbRel( $archiveName, $suffix = false ) {
- $path = 'archive/' . $this->getHashPath() . $archiveName . "/";
- if ( $suffix === false ) {
- $path = substr( $path, 0, -1 );
- } else {
- $path .= $suffix;
+ $path = $this->getArchiveRel( $archiveName );
+ if ( $suffix !== false ) {
+ $path .= '/' . $suffix;
}
return $path;
$ext = $this->getExtension();
$path = $this->repo->getZoneUrl( 'public', $ext ) . '/archive/' . $this->getHashPath();
if ( $suffix === false ) {
- $path = substr( $path, 0, -1 );
+ $path = rtrim( $path, '/' );
} else {
$path .= rawurlencode( $suffix );
}
$this->assertRepoDefined();
$ext = $this->getExtension();
$path = $this->repo->getZoneUrl( 'thumb', $ext ) . '/archive/' .
- $this->getHashPath() . rawurlencode( $archiveName ) . "/";
- if ( $suffix === false ) {
- $path = substr( $path, 0, -1 );
- } else {
- $path .= rawurlencode( $suffix );
+ $this->getHashPath() . rawurlencode( $archiveName );
+ if ( $suffix !== false ) {
+ $path .= '/' . rawurlencode( $suffix );
}
return $path;
$this->assertRepoDefined();
$path = $this->repo->getVirtualUrl() . '/public/archive/' . $this->getHashPath();
if ( $suffix === false ) {
- $path = substr( $path, 0, -1 );
+ $path = rtrim( $path, '/' );
} else {
$path .= rawurlencode( $suffix );
}
* @note Use getWidth()/getHeight() instead of this method unless you have a
* a good reason. This method skips all caches.
*
- * @param string $filePath The path to the file (e.g. From getLocalPathRef() )
+ * @param string $filePath The path to the file (e.g. From getLocalRefPath() )
* @return array|false The width, followed by height, with optionally more things after
*/
function getImageSize( $filePath ) {