Merge pull request #533 from owncloud/milliseconds
WebODF uses timestamps with milliseconds
This commit is contained in:
commit
a7da2844f9
@ -90,7 +90,7 @@ class Op extends \OCA\Documents\Db {
|
|||||||
$op = array(
|
$op = array(
|
||||||
'optype' => 'AddMember',
|
'optype' => 'AddMember',
|
||||||
'memberid' => (string) $memberId,
|
'memberid' => (string) $memberId,
|
||||||
'timestamp' => (string) time(),
|
'timestamp' => $this->getMillisecondsAsString(),
|
||||||
'setProperties' => array(
|
'setProperties' => array(
|
||||||
'fullName' => $fullName,
|
'fullName' => $fullName,
|
||||||
'color' => $color,
|
'color' => $color,
|
||||||
@ -106,7 +106,7 @@ class Op extends \OCA\Documents\Db {
|
|||||||
'optype' => 'RemoveCursor',
|
'optype' => 'RemoveCursor',
|
||||||
'memberid' => (string) $memberId,
|
'memberid' => (string) $memberId,
|
||||||
'reason' => 'server-idle',
|
'reason' => 'server-idle',
|
||||||
'timestamp' => (string) time()
|
'timestamp' => $this->getMillisecondsAsString()
|
||||||
);
|
);
|
||||||
$this->insertOp($esId, $memberId, $op);
|
$this->insertOp($esId, $memberId, $op);
|
||||||
}
|
}
|
||||||
@ -115,7 +115,7 @@ class Op extends \OCA\Documents\Db {
|
|||||||
$op = array(
|
$op = array(
|
||||||
'optype' => 'RemoveMember',
|
'optype' => 'RemoveMember',
|
||||||
'memberid' => (string) $memberId,
|
'memberid' => (string) $memberId,
|
||||||
'timestamp' => (string) time()
|
'timestamp' => $this->getMillisecondsAsString()
|
||||||
);
|
);
|
||||||
$this->insertOp($esId, $memberId, $op);
|
$this->insertOp($esId, $memberId, $op);
|
||||||
}
|
}
|
||||||
@ -125,7 +125,7 @@ class Op extends \OCA\Documents\Db {
|
|||||||
$op = array(
|
$op = array(
|
||||||
'optype' => 'UpdateMember',
|
'optype' => 'UpdateMember',
|
||||||
'memberid' => (string) $memberId,
|
'memberid' => (string) $memberId,
|
||||||
'timestamp' => (string) time(),
|
'timestamp' => $this->getMillisecondsAsString(),
|
||||||
'setProperties' => array(
|
'setProperties' => array(
|
||||||
'fullName' => $fullName,
|
'fullName' => $fullName,
|
||||||
)
|
)
|
||||||
@ -184,4 +184,11 @@ class Op extends \OCA\Documents\Db {
|
|||||||
}
|
}
|
||||||
return $ops;
|
return $ops;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getMillisecondsAsString(){
|
||||||
|
$microtime = microtime();
|
||||||
|
list($usec, $sec) = explode(" ", $microtime);
|
||||||
|
$milliseconds = $sec.substr($usec, 2, 3);
|
||||||
|
return $milliseconds;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user