Merge pull request #1880 from protich/issue/user-quick-search

bug: Support quick user id filtering

Reviewed-By: Jared Hancock <jared@osticket.com>

include/staff/tickets.inc.php

@@ -59,12 +59,7 @@ case 'search':
             )));
         }
         break;
-    }
-    elseif (isset($_GET['uid'])) {
-        // Apply user filter
-        $tickets->filter(array('user__id'=>$_GET['uid']));
-    }
-    elseif (isset($_SESSION['advsearch'])) {
+    } elseif (isset($_SESSION['advsearch'])) {
         // XXX: De-duplicate and simplify this code
         $form = $search->getFormFromSession('advsearch');
         $form->loadState($_SESSION['advsearch']);
@@ -87,6 +82,12 @@ case 'open':
     break;
 }
 
+// Apply user filter
+if (isset($_GET['uid'])) {
+    $tickets->filter(array('user__id'=>$_GET['uid']));
+}
+
+
 // Apply primary ticket status
 if ($status)
     $tickets->filter(array('status__state'=>$status));