appdb/admin adminAppQueue.php

[WineHQ]

ChangeSet ID:	21225
CVSROOT:	/opt/cvs-commit
Module name:	appdb
Changes by:	wineowner at winehq.org	2005/11/11 21:06:55

Modified files:
	admin          : adminAppQueue.php 

Log message:
	Tony Lambregts <tony.lambregts at gmail.com>
	Fix merging of versions into existing applications

Patch: http://cvs.winehq.org/patch.py?id=21225

Old revision  New revision  Changes     Path
 1.48          1.49          +4 -3       appdb/admin/adminAppQueue.php

Index: appdb/admin/adminAppQueue.php
diff -u -p appdb/admin/adminAppQueue.php:1.48 appdb/admin/adminAppQueue.php:1.49
--- appdb/admin/adminAppQueue.php:1.48	12 Nov 2005  3: 6:55 -0000
+++ appdb/admin/adminAppQueue.php	12 Nov 2005  3: 6:55 -0000
@@ -46,7 +46,7 @@ function outputSearchTableForDuplicateFl
             //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 */