mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1236-database-changes

Browse Source
This commit is contained in:
Daniël Klabbers
2018-06-27 21:23:52 +02:00
parent 36608b31be 40d5633662
commit db6f4f2c77
5 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/js/dist/forum.js vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/dist/forum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/src/forum/components/CommentPost.js
View File

@@ -80,7 +80,7 @@ export default class CommentPost extends Post {
const post = this.props.post; const post = this.props.post;
const attrs = super.attrs(); const attrs = super.attrs();
attrs.className += ' '+classList({ attrs.className = (attrs.className || '') + ' ' + classList({
'CommentPost': true, 'CommentPost': true,
'Post--hidden': post.isHidden(), 'Post--hidden': post.isHidden(),
'Post--edited': post.isEdited(), 'Post--edited': post.isEdited(),

2
framework/core/js/src/forum/components/EventPost.js
View File

@@ -18,7 +18,7 @@ export default class EventPost extends Post {
attrs() { attrs() {
const attrs = super.attrs(); const attrs = super.attrs();
attrs.className += ' EventPost ' + ucfirst(this.props.post.contentType()) + 'Post'; attrs.className = (attrs.className || '') + ' EventPost ' + ucfirst(this.props.post.contentType()) + 'Post';
return attrs; return attrs;
} }

8
framework/core/src/Extension/Extension.php
View File

@@ -119,7 +119,13 @@ class Extension implements Arrayable
return; return;
} }
$extenders = array_flatten((array) require $bootstrapper); $extenders = require $bootstrapper;
if (! is_array($extenders)) {
$extenders = [$extenders];
}
$extenders = array_flatten($extenders);
foreach ($extenders as $extender) { foreach ($extenders as $extender) {
// If an extension has not yet switched to the new bootstrap.php // If an extension has not yet switched to the new bootstrap.php