summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorspiderr <spider@viovio.com>2012-03-28 13:36:08 -0400
committerspiderr <spider@viovio.com>2012-03-28 13:36:08 -0400
commita384ce3a74425c8f32e50680bfefa52be86aac4e (patch)
tree3d97ab6b845503b656b716a6d1eb303009495a6c
parent7289d53242d73acfabba60462490a9f075e2e609 (diff)
downloadfisheye-a384ce3a74425c8f32e50680bfefa52be86aac4e.tar.gz
fisheye-a384ce3a74425c8f32e50680bfefa52be86aac4e.tar.bz2
fisheye-a384ce3a74425c8f32e50680bfefa52be86aac4e.zip
fix getDisplayUrl
-rw-r--r--FisheyeGallery.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/FisheyeGallery.php b/FisheyeGallery.php
index 4a905f4..886cf8a 100644
--- a/FisheyeGallery.php
+++ b/FisheyeGallery.php
@@ -630,19 +630,20 @@ class FisheyeGallery extends FisheyeBase {
* @return the url to display the gallery.
*/
function getDisplayUrl( $pGalleryId=NULL, $pHash=NULL ) {
+ $path = NULL;
if( !BitBase::verifyId( $pGalleryId ) && is_object( $this ) ) {
$pGalleryId = $this->mGalleryId;
- $pPath = $this->mGalleryPath;
+ $path = $this->mGalleryPath;
}
if( BitBase::verifyId( $pGalleryId ) ) {
$ret = FISHEYE_PKG_URL;
global $gBitSystem;
if( $gBitSystem->isFeatureActive( 'pretty_urls' ) ) {
- $ret .= 'gallery'.$pPath.'/'.$pGalleryId;
+ $ret .= 'gallery'.$path.'/'.$pGalleryId;
} else {
$ret .= 'view.php?gallery_id='.$pGalleryId;
- if( !empty( $pPath ) ) {
- $ret .= '&gallery_path='.$pPath;
+ if( !empty( $path ) ) {
+ $ret .= '&gallery_path='.$path;
}
}
} elseif( @BitBase::verifyId( $pHash['content_id'] ) ) {