diff options
| author | spiderr <spider@viovio.com> | 2014-09-22 18:05:44 -0400 |
|---|---|---|
| committer | spiderr <spider@viovio.com> | 2014-09-22 18:05:44 -0400 |
| commit | e38344393ee4d58ea0c670e9e33df3297c702d3e (patch) | |
| tree | 91f443cb562818da239328084a921ca88fe33c24 | |
| parent | 38177b973409f1ea863ac2744167db12f4c09376 (diff) | |
| download | fisheye-e38344393ee4d58ea0c670e9e33df3297c702d3e.tar.gz fisheye-e38344393ee4d58ea0c670e9e33df3297c702d3e.tar.bz2 fisheye-e38344393ee4d58ea0c670e9e33df3297c702d3e.zip | |
getTitleFromHash-cleanup
| -rw-r--r-- | FisheyeImage.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/FisheyeImage.php b/FisheyeImage.php index 9d80a5d..1162dbd 100644 --- a/FisheyeImage.php +++ b/FisheyeImage.php @@ -675,7 +675,7 @@ class FisheyeImage extends FisheyeBase { } if( empty( $pTitle ) ) { - $pTitle = FisheyeImage::getTitle( $pMixed ); + $pTitle = FisheyeImage::getTitleFromHash( $pMixed ); } $ret = $pTitle; @@ -685,11 +685,8 @@ class FisheyeImage extends FisheyeBase { return $ret; } - function getTitle( $pHash=NULL, $pDefault=TRUE ) { - if( empty( $pHash ) && !empty( $this ) ) { - $pMixed = $this->mInfo; - } - $ret = trim( parent::getTitle( $pHash, $pDefault ) ); + function getTitleFromHash( $pHash, $pDefault=TRUE ) { + $ret = trim( parent::getTitleFromHash( $pHash, $pDefault ) ); if( empty( $ret ) && $pDefault ) { $storage = (!empty( $this->mStorage ) ? current( $this->mStorage ) : NULL); if( !empty( $storage['file_name'] ) ) { |