From 9ce482da3960ee43decee41fba53b78c12c3e52c Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Sat, 24 Sep 2016 10:28:06 -0700
Subject: rt 4.2.13 ticket#13852

---
 rt/share/html/Elements/SelectNewTicketQueue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'rt/share/html/Elements/SelectNewTicketQueue')

diff --git a/rt/share/html/Elements/SelectNewTicketQueue b/rt/share/html/Elements/SelectNewTicketQueue
index 57abc447b..1cc5fa00d 100755
--- a/rt/share/html/Elements/SelectNewTicketQueue
+++ b/rt/share/html/Elements/SelectNewTicketQueue
@@ -2,7 +2,7 @@
 %#
 %# COPYRIGHT:
 %#
-%# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC
 %#                                          <sales@bestpractical.com>
 %#
 %# (Except where explicitly superseded by other copyright notices)
@@ -49,11 +49,14 @@
   <& /Elements/SelectQueue, Name => 'Queue', Default => $queue, %ARGS, ShowNullOption => 0, ShowAllQueues => 0 &>
 </label>
 <%INIT>
-my $queue = RT->Config->Get("DefaultQueue", $session{'CurrentUser'});
+my $queue = delete $ARGS{Default};
+if ( !$queue ) {
+    $queue = RT->Config->Get("DefaultQueue", $session{'CurrentUser'});
 
-if (RT->Config->Get("RememberDefaultQueue", $session{'CurrentUser'})) {
-    if (my $session_default = $session{'DefaultQueue'}) {
-        $queue = $session_default;
+    if (RT->Config->Get("RememberDefaultQueue", $session{'CurrentUser'})) {
+        if (my $session_default = $session{'DefaultQueue'}) {
+            $queue = $session_default;
+        }
     }
 }
 
-- 
cgit v1.2.1