diff options
| author | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-17 20:12:58 +0100 |
|---|---|---|
| committer | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-17 20:12:58 +0100 |
| commit | acd866e421e9ca21c941587c67fcca6c4713c03a (patch) | |
| tree | 1b2cd9fb5c9fd2d9aa1294a56ec6a4540fa31e75 /edit_image.php | |
| parent | bbb96f97e0301f4083e39a0e5a9117dc92f0c565 (diff) | |
| download | fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.tar.gz fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.tar.bz2 fisheye-acd866e421e9ca21c941587c67fcca6c4713c03a.zip | |
Tidy up to remove 'STRICT' warnings
Split static and dynamic use of getDisplayUrl
Create getContentUrl as the instantiated version
parameters need to be identical across all classes
Diffstat (limited to 'edit_image.php')
| -rw-r--r-- | edit_image.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/edit_image.php b/edit_image.php index e8b0d55..77de895 100644 --- a/edit_image.php +++ b/edit_image.php @@ -88,7 +88,7 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] ) } if( empty( $gContent->mErrors ) ) { // add a refresh parameter to the URL so the thumbnails will properly refresh first go reload - header( 'Location: '.$gContent->getDisplayUrl().($gBitSystem->isFeatureActive( 'pretty_urls' ) ? '?' : '&' ).'refresh=1' ); + header( 'Location: '.$gContent->getContentUrl().($gBitSystem->isFeatureActive( 'pretty_urls' ) ? '?' : '&' ).'refresh=1' ); die; } } @@ -112,7 +112,7 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] ) ); } else { if( $gContent->expunge() ) { - $url = ( is_object( $gGallery ) ? $gGallery->getDisplayUrl() : FISHEYE_PKG_URL ); + $url = ( is_object( $gGallery ) ? $gGallery->getContentUrl() : FISHEYE_PKG_URL ); header( "Location: $url" ); } } @@ -136,7 +136,7 @@ if( $gContent->mContentId ) { if( $gBitSystem->isFeatureActive( 'fisheye_show_all_to_admins' ) && $gBitUser->hasPermission( 'p_fisheye_admin' ) ) { unset( $getHash['user_id'] ); } elseif( $gBitSystem->isFeatureActive( 'fisheye_show_public_on_upload' ) ) { -// $getHash['show_public'] = TRUE; + $getHash['show_public'] = TRUE; } $galleryTree = $gFisheyeGallery->generateList( $getHash, array( 'name' => "gallery_id", 'id' => "gallerylist", 'item_attributes' => array( 'class'=>'listingtitle'), 'radio_checkbox' => TRUE, ), true ); $gBitSmarty->assign_by_ref( 'galleryTree', $galleryTree ); |