Merge pull request #878 from greezybacon/issue/ticket-lock-lookup

Fix parameter count to TicketLock::lookup Reviewed-By: Peter Rotich <peter@osticket.com>
osTicket · Jan 18, 2014 · 6c5921c · 6c5921c
2 parents 5e8e233 + d8c001e
commit 6c5921c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
@@ -191,7 +191,7 @@ function search() {
     function acquireLock($tid) {
         global $cfg,$thisstaff;
 
-        if(!$tid or !is_numeric($tid) or !$thisstaff or !$cfg or !$cfg->getLockTime())
+        if(!$tid || !is_numeric($tid) || !$thisstaff || !$cfg || !$cfg->getLockTime())
             return 0;
 
         if(!($ticket = Ticket::lookup($tid)) || !$ticket->checkStaffAccess($thisstaff))
@@ -218,10 +218,10 @@ function acquireLock($tid) {
     function renewLock($tid, $id) {
         global $thisstaff;
 
-        if(!$id or !is_numeric($id) or !$thisstaff)
+        if(!$tid || !is_numeric($tid) || !$id || !is_numeric($id) || !$thisstaff)
             return $this->json_encode(array('id'=>0, 'retry'=>true));
 
-        $lock= TicketLock::lookup($id);
+        $lock= TicketLock::lookup($id, $tid);
         if(!$lock || !$lock->getStaffId() || $lock->isExpired()) //Said lock doesn't exist or is is expired
             return self::acquireLock($tid); //acquire the lock