From 3efdcb188c5551fcbea2bcc30a7c5e938a99bbf3 Mon Sep 17 00:00:00 2001
From: Tony Lambregts <tony.lambregts@gmail.com>
Date: Sat, 12 Nov 2005 03:06:55 +0000
Subject: [PATCH] Fix merging of versions into existing applications

---
 admin/adminAppQueue.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/admin/adminAppQueue.php b/admin/adminAppQueue.php
index 2e41bd9..e78baa9 100644
--- a/admin/adminAppQueue.php
+++ b/admin/adminAppQueue.php
@@ -46,7 +46,7 @@ function outputSearchTableForDuplicateFlagging($currentAppId, $hResult)
             //display row
             echo "<tr class=$bgcolor>\n";
             /* map the merging of the current app to the app we are displaying in the table */
-            echo "    <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n";
+            echo "    <td>".html_ahref($ob->appName,"adminAppQueue.php?sub=duplicate&apptype=application&appId=".$currentAppId."&appIdMergeTo=".$ob->appId)."</td>\n";
             echo "    <td>$y->versions versions &nbsp;</td>\n";
             echo "</tr>\n\n";
 
@@ -172,9 +172,10 @@ if ($_REQUEST['sub'])
             /* move this version submission under the existing app */
             $oVersion->iAppId = $_REQUEST['appIdMergeTo'];
             $oVersion->update();
-        
+
             /* delete the appId that is the duplicate */
-            $oApp->delete();
+            $oAppDelete = new Application($oApp->iAppId);
+            $oAppDelete->delete();
         }
 
         /* redirect back to the main page */