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

Merge remote-tracking branch 'flarum/master' into core-key-reorganization

Browse Source
This commit is contained in:
dcsjapan
2015-09-23 14:58:34 +09:00
parent cfb4406b55 b87a708e34
commit fb5fec7290
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,7 +181,7 @@ class PostStream extends mixin(Component, evented) {
.map(id => { .map(id => {
const post = app.store.getById('posts', id); const post = app.store.getById('posts', id);
return post && post.discussion() && post.user() !== false ? post : null; return post && post.discussion() && post.user() !== false && post.canEdit() !== null ? post : null;
}); });
} }

2
framework/core/less/lib/Badge.less
View File

@@ -6,7 +6,7 @@
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
text-align: center; text-align: center;
box-shadow: 0 2px 6px @shadow-color; .box-shadow(0 2px 6px @shadow-color);
.Badge-label { .Badge-label {
display: none; display: none;

2
framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php
View File

@@ -38,6 +38,8 @@ class ReadNotificationHandler
]) ])
->update(['is_read' => true]); ->update(['is_read' => true]);
$notification->is_read = true;
return $notification; return $notification;
} }
} }

9
framework/core/views/app.blade.php
View File

@@ -27,7 +27,9 @@
@endforeach @endforeach
<script> <script>
@if (! $forum->attributes->debug)
try { try {
@endif
var app = System.get('flarum/app').default; var app = System.get('flarum/app').default;
babelHelpers._extends(app, {!! json_encode($app) !!}); babelHelpers._extends(app, {!! json_encode($app) !!});
@@ -37,12 +39,11 @@
@endforeach @endforeach
app.boot(); app.boot();
@if (! $forum->attributes->debug)
} catch (e) { } catch (e) {
@if (! $forum->attributes->debug) window.location = window.location + '?nojs=1';
window.location = window.location + '?nojs=1';
@endif
throw e;
} }
@endif
</script> </script>
@endif @endif