Don't overwrite the new queue with the ticket's previous queue.

diff --git a/whups/ticket/queue.php b/whups/ticket/queue.php
index 0787314..9fe9344 100644 (file)
--- a/whups/ticket/queue.php
+++ b/whups/ticket/queue.php
@@ -67,6 +67,7 @@ class SetQueueStep2Form extends Horde_Form {
 
         /* Give the user an opportunity to check that type, version,
          * etc. are still valid. */
+
         $queue = $vars->get('queue');
 
         $info = $whups_driver->getQueue($queue);
@@ -118,9 +119,16 @@ class SetQueueStep3Form extends Horde_Form {
 $ticket = Whups::getCurrentTicket();
 $vars = Horde_Variables::getDefaultVariables();
 $vars->set('id', $id = $ticket->getId());
+$form = $vars->get('formname');
+if ($form != 'setqueuestep1form') {
+    $q = $vars->get('queue');
+}
 foreach ($ticket->getDetails() as $varname => $value) {
     $vars->add($varname, $value);
 }
+if (!empty($q)) {
+    $vars->set('queue', $q);
+}
 
 // Check permissions on this ticket.
 if (!Whups::hasPermission($ticket->get('queue'), 'queue', Horde_Perms::DELETE)) {
@@ -129,7 +137,6 @@ if (!Whups::hasPermission($ticket->get('queue'), 'queue', Horde_Perms::DELETE))
         ->redirect();
 }
 
-$form = $vars->get('formname');
 $action = '';
 
 if ($form == 'setqueuestep1form') {