synch recent changes from R1 to HEAD

1 files changed, 2 insertions, 19 deletions

diff --git a/edit_image.php b/edit_image.php
index 83818b3..fe28936 100644
--- a/edit_image.php
+++ b/edit_image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.4 2005/08/01 18:40:07 squareing Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_fisheye/edit_image.php,v 1.5 2005/08/24 20:50:17 squareing Exp $
  * @package fisheye
  * @subpackage functions
  */
@@ -52,14 +52,6 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] )
 		if( !empty( $_REQUEST['rotate_image'] ) ) {
 			$gContent->rotateImage( $_REQUEST['rotate_image'] );
 		}
-		if ( $gBitSystem->isPackageActive('categories') ) {
-			$cat_desc = $gLibertySystem->mContentTypes[FISHEYEIMAGE_CONTENT_TYPE_GUID]['content_description'].' by '.$gBitUser->getDisplayName( FALSE, array( 'real_name' => $gContent->mInfo['creator_real_name'], 'user' => $gContent->mInfo['creator_user'], 'user_id'=>$gContent->mInfo['user_id'] ) );
-			$cat_name = $gContent->getTitle();
-			$cat_href = $gContent->getDisplayUrl();
-			$cat_objid = $gContent->mContentId;
-			$cat_obj_type = FISHEYEIMAGE_CONTENT_TYPE_GUID;
-			include_once( CATEGORIES_PKG_PATH.'categorize_inc.php' );
-		}
 		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' );
@@ -84,12 +76,6 @@ if( !empty($_REQUEST['saveImage']) || !empty($_REQUEST['regenerateThumbnails'] )
 
 }
 
-if ( $gBitSystem->isPackageActive('categories') ) {
-	$cat_type = FISHEYEGALLERY_CONTENT_TYPE_GUID;
-	$cat_objid = $gContent->mContentId;
-	include_once( CATEGORIES_PKG_PATH.'categorize_list_inc.php' );
-}
-
 $errors = $gContent->mErrors;
 $gBitSmarty->assign_by_ref('errors', $errors);
 
@@ -103,10 +89,7 @@ $gBitSmarty->assign_by_ref('galleryList', $galleryList);
 
 $gBitSmarty->assign('requested_gallery', !empty($_REQUEST['gallery_id']) ? $_REQUEST['gallery_id'] : NULL);
 
-if( $gBitSystem->isPackageActive( 'gatekeeper' ) ) {
-	global $gGatekeeper;
-	$gBitSmarty->assign( 'securities', $gGatekeeper->getSecurityList( $gBitUser->mUserId ) );
-}
+$gContent->invokeServices( 'content_edit_function' );
 
 $gBitSystem->display( 'bitpackage:fisheye/edit_image.tpl', 'Edit Image: '.$gContent->getTitle() );