[pLog-svn] r6946 - plog/branches/lifetype-1.2/class/action/admin

[jondaley at devel.lifetype.net]

Author: jondaley
Date: 2010-01-06 14:33:32 -0500 (Wed, 06 Jan 2010)
New Revision: 6946

Modified:
   plog/branches/lifetype-1.2/class/action/admin/admindeletegalleryitemsaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/admindeleteresourceaction.class.php
   plog/branches/lifetype-1.2/class/action/admin/admindeleteresourcealbumaction.class.php
Log:
PRE_XX_DELETE event was being fired twice, rather than the POST_XX_DELETE event

Modified: plog/branches/lifetype-1.2/class/action/admin/admindeletegalleryitemsaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/admindeletegalleryitemsaction.class.php	2010-01-06 19:27:18 UTC (rev 6945)
+++ plog/branches/lifetype-1.2/class/action/admin/admindeletegalleryitemsaction.class.php	2010-01-06 19:33:32 UTC (rev 6946)
@@ -101,7 +101,7 @@
 								$this->_successMessage = $this->_locale->pr("items_deleted_ok", $this->_totalOk );
 							else
 								$this->_successMessage .= $this->_locale->pr("item_deleted_ok", $resource->getFileName());
-							$this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
+							$this->notifyEvent( EVENT_POST_RESOURCE_DELETE, Array( "resource" => &$resource ));
 						}
 						else 
 							$this->_errorMessage .= $this->_locale->pr("error_deleting_resource", $resource->getFileName())."<br/>";

Modified: plog/branches/lifetype-1.2/class/action/admin/admindeleteresourceaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/admindeleteresourceaction.class.php	2010-01-06 19:27:18 UTC (rev 6945)
+++ plog/branches/lifetype-1.2/class/action/admin/admindeleteresourceaction.class.php	2010-01-06 19:33:32 UTC (rev 6946)
@@ -60,7 +60,7 @@
            	$res = $resources->deleteResource( $resourceId, $this->_blogInfo->getId());
             if( $res ) {
 				$this->_view->setSuccessMessage( $this->_locale->pr("resource_deleted_ok", $resource->getFileName()));
-				$this->notifyEvent( EVENT_PRE_RESOURCE_DELETE, Array( "resource" => &$resource ));
+				$this->notifyEvent( EVENT_POST_RESOURCE_DELETE, Array( "resource" => &$resource ));
 
 				// clear the cache if everything went fine
 				CacheControl::resetBlogCache( $this->_blogInfo->getId(), false );

Modified: plog/branches/lifetype-1.2/class/action/admin/admindeleteresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/admindeleteresourcealbumaction.class.php	2010-01-06 19:27:18 UTC (rev 6945)
+++ plog/branches/lifetype-1.2/class/action/admin/admindeleteresourcealbumaction.class.php	2010-01-06 19:33:32 UTC (rev 6946)
@@ -68,7 +68,7 @@
                	// otherwise, we can go ahead and remove it
            		if( $albums->deleteAlbum( $albumId, $this->_blogInfo->getId())) {
 					$this->_view->setSuccessMessage( $this->_locale->pr("album_deleted_ok", $album->getName()));
-					$this->notifyEvent( EVENT_PRE_ALBUM_DELETE, Array( "album" => &$album ));						
+					$this->notifyEvent( EVENT_POST_ALBUM_DELETE, Array( "album" => &$album ));						
 					// clear the cache
 					CacheControl::resetBlogCache( $this->_blogInfo->getId(), false );
 				}