Alexander Nicolaysen Sørnes <alex@thehandofagony.com>

Let objectManager handle deletion and delete notification.

objectManager.php

@@ -48,6 +48,9 @@ if(isset($aClean['bIsQueue']) && $aClean['bIsQueue'] == 'true')
 else
     $oObject->bIsQueue = false;
 
+if(isset($aClean['sReturnTo']))
+    $oObject->sReturnTo = $aClean['sReturnTo'];
+
 $aClean['bIsRejected'] = isset($aClean['bIsRejected']) ? $aClean['bIsRejected'] : false;
 /* If it is rejected it is defined as queued */
 if($aClean['bIsRejected'] == 'true')
@@ -68,11 +71,6 @@ $oOtherObject = new $oObject->sClass($oObject->iId);
    on failure */
 $sErrors = $oObject->processForm($aClean);
 
-if($oObject->iId && $aClean['sAction'] == "delete")
-{
-    $oObject->delete_entry();
-}
-
 if(isset($aClean['sAction']) && $aClean['sAction'] == "add")
     $oObject->handle_anonymous_submission();
 
@@ -100,6 +98,10 @@ if($oObject->iId)
         $oObject->display_move_children();
         break;
 
+        case "delete":
+        $oObject->delete_prompt();
+        break;
+
         default:
         $oObject->view($_SERVER['REQUEST_URI']);
         break;