From 93bfd1ab6a86bbb039ac5b0658ced5868da585f7 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Wed, 4 Sep 2013 20:48:14 +0300
Subject: [PATCH] Inject removeCursor as latest op

---
 ajax/otpoll.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index 31bf8e9d..bdc15515 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -81,12 +81,7 @@ try{
 				$memberId = $request->getParam('args/member_id');
 				$ops = $request->getParam('args/client_ops');
 				$hasOps = is_array($ops) && count($ops)>0;
-				$inactiveMembers = Member::cleanSession($esId);
-				if (is_array($inactiveMembers)){
-					foreach ($inactiveMembers as $member){
-						Op::removeCursor($esId, $member['member_id']);
-					}
-				}
+
 				$currentHead = Op::getHeadSeq($esId);
 				try {
 					Member::updateMemberActivity($memberId);
@@ -114,6 +109,14 @@ try{
 					$response["head_seq"] = $currentHead;
 					$response["result"] = $hasOps ? 'conflict' : 'new_ops';
 				}
+				
+				$inactiveMembers = Member::cleanSession($esId);
+				if (is_array($inactiveMembers)){
+					foreach ($inactiveMembers as $member){
+						Op::removeCursor($esId, $member['member_id']);
+					}
+				}
+				
 			} else {
 				// Error - no seq_head passed
 				throw new BadRequestException();