mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 10:16:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1236-database-changes

Browse Source 
# Conflicts:
#	src/Forum/Controller/IndexController.php
#	src/User/UserMetadataUpdater.php
This commit is contained in:
Toby Zerner
2018-07-21 21:37:49 +09:30
parent d42f33971a c562302161
commit 677a7dd2d3
101 changed files with 3073 additions and 2272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Post/Command/EditPostHandler.php
View File

@@ -68,7 +68,7 @@ class EditPostHandler
}
if (isset($attributes['isHidden'])) {
$this->assertCan($actor, 'edit', $post);
$this->assertCan($actor, 'hide', $post);
if ($attributes['isHidden']) {
$post->hide($actor);

3
src/Post/CommentPost.php
View File

@@ -166,10 +166,9 @@ class CommentPost extends Post
/**
* Get the content rendered as HTML.
*
* @param string $value
* @return string
*/
public function getContentHtmlAttribute($value)
public function getContentHtmlAttribute()
{
return static::$formatter->render($this->attributes['content'], $this);
}

6
src/Post/Post.php
View File

@@ -121,9 +121,13 @@ class Post extends AbstractModel
// Make sure the post's discussion is visible as well
$query->whereExists(function ($query) use ($actor) {
$grammar = $query->getGrammar();
$column1 = $grammar->wrap('discussions.id');
$column2 = $grammar->wrap('posts.discussion_id');
$query->selectRaw('1')
->from('discussions')
->whereRaw('discussions.id = posts.discussion_id');
->whereRaw("$column1 = $column2");
static::$dispatcher->dispatch(
new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'view')

4
src/Post/PostPolicy.php
View File

@@ -79,7 +79,7 @@ class PostPolicy extends AbstractPolicy
// Hide hidden posts, unless they are authored by the current user, or
// the current user has permission to view hidden posts in the
// discussion.
if (! $actor->hasPermission('discussion.editPosts')) {
if (! $actor->hasPermission('discussion.hidePosts')) {
$query->where(function ($query) use ($actor) {
$query->whereNull('posts.hidden_at')
->orWhere('posts.user_id', $actor->id)
@@ -89,7 +89,7 @@ class PostPolicy extends AbstractPolicy
->whereRaw('discussions.id = posts.discussion_id')
->where(function ($query) use ($actor) {
$this->events->dispatch(
new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'editPosts')
new ScopeModelVisibility(Discussion::query()->setQuery($query), $actor, 'hidePosts')
);
});
});