Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2019-09-25 10:07:07 +0300
committerJoas Schilling <coding@schilljs.com>2019-09-25 10:07:07 +0300
commite4b36f4f47e40529fd41a0b0c55a68a093f725f1 (patch)
treebc1a784e7f252ff853017455088c3b22586da54c /lib
parent61d22ff6cf54af0250a9917ab1b30a5dff1cb236 (diff)
Fix user with id 0 to be able to comment
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Comments/Comment.php6
-rw-r--r--lib/private/Comments/Manager.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/Comments/Comment.php b/lib/private/Comments/Comment.php
index c9862c64ca6..7c935930f28 100644
--- a/lib/private/Comments/Comment.php
+++ b/lib/private/Comments/Comment.php
@@ -299,12 +299,12 @@ class Comment implements IComment {
public function setActor($actorType, $actorId) {
if(
!is_string($actorType) || !trim($actorType)
- || !is_string($actorId) || !trim($actorId)
+ || !is_string($actorId) || $actorId === ''
) {
throw new \InvalidArgumentException('String expected.');
}
$this->data['actorType'] = trim($actorType);
- $this->data['actorId'] = trim($actorId);
+ $this->data['actorId'] = $actorId;
return $this;
}
@@ -385,7 +385,7 @@ class Comment implements IComment {
public function setObject($objectType, $objectId) {
if(
!is_string($objectType) || !trim($objectType)
- || !is_string($objectId) || !trim($objectId)
+ || !is_string($objectId) || trim($objectId) === ''
) {
throw new \InvalidArgumentException('String expected.');
}
diff --git a/lib/private/Comments/Manager.php b/lib/private/Comments/Manager.php
index e54218509dc..024dd58b89c 100644
--- a/lib/private/Comments/Manager.php
+++ b/lib/private/Comments/Manager.php
@@ -118,9 +118,9 @@ class Manager implements ICommentsManager {
*/
protected function prepareCommentForDatabaseWrite(IComment $comment) {
if (!$comment->getActorType()
- || !$comment->getActorId()
+ || $comment->getActorId() === ''
|| !$comment->getObjectType()
- || !$comment->getObjectId()
+ || $comment->getObjectId() === ''
|| !$comment->getVerb()
) {
throw new \UnexpectedValueException('Actor, Object and Verb information must be provided for saving');