From 6d33c54c6c37380ef381f0882045e776a6afcbab Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Mon, 12 Aug 2013 15:53:27 +0300 Subject: [PATCH] MemberId is now string --- ajax/controller.php | 4 ++-- lib/op.php | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ajax/controller.php b/ajax/controller.php index e7293156..775dd2e1 100644 --- a/ajax/controller.php +++ b/ajax/controller.php @@ -43,7 +43,7 @@ class Controller { $session = Session::add($genesisPath, $hash, $path); } - $session['member_id'] = Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); + $session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); \OCP\JSON::success($session); exit(); @@ -71,7 +71,7 @@ class Controller { if ($esId){ $session = Session::getSession($esId); - $session['member_id'] = Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); + $session['member_id'] = (string) Member::add($session['es_id'], \OCP\User::getUser(), '#00f000'); \OCP\JSON::success($session); exit(); } diff --git a/lib/op.php b/lib/op.php index 79a75be6..0ed5b80f 100644 --- a/lib/op.php +++ b/lib/op.php @@ -50,7 +50,11 @@ class Op { public static function getOpsAfterJson($esId, $seq){ $ops = self::getOpsAfter($esId, $seq); $ops = array_map( - function($x){return json_decode($x['opspec']);}, + function($x){ + $decoded = json_decode($x['opspec']); + $decoded['memberId'] = strval($decoded['memberId']); + return $decoded; + }, $ops ); return $ops;