Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
[Sprint/KiltedKoala] (fix): groups conversations issue
· 14927878
Marcelo Rivera
authored
Aug 01, 2019
and
Mark Harding
committed
Aug 01, 2019
14927878
Merge branch 'fix/groups-conversation-issue' into 'master'
· 07015d77
Mark Harding
authored
Aug 01, 2019
[Sprint/KiltedKoala] (fix): groups conversations issue Closes
#700
See merge request
!289
07015d77
Hide whitespace changes
Inline
Side-by-side
Controllers/api/v1/comments.php
View file @
07015d77
...
...
@@ -157,12 +157,12 @@ class comments implements Interfaces\Api
]);
}
if
(
!
$entity
->
getAllowComments
())
{
if
(
method_exists
(
$entity
,
'getAllowComments'
)
&&
!
$entity
->
getAllowComments
())
{
return
Factory
::
response
([
'status'
=>
'error'
,
'message'
=>
'Comments are disabled for this post'
]);
}
}
if
(
!
$_POST
[
'comment'
]
&&
!
$_POST
[
'attachment_guid'
])
{
return
Factory
::
response
([
...
...
@@ -171,13 +171,6 @@ class comments implements Interfaces\Api
]);
}
if
(
$entity
instanceof
Entities\Activity
&&
!
$entity
->
commentsEnabled
)
{
return
Factory
::
response
([
'status'
=>
'error'
,
'message'
=>
'Comments are disabled for this post'
]);
}
/*if (!Security\ACL::_()->write($entity)) {
return Factory::response([
'status' => 'error',
...
...