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

framework/core/js/forum/src/components/PostStream.js

@@ -181,7 +181,7 @@ class PostStream extends mixin(Component, evented) {
       .map(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;
       });
   }
 

framework/core/less/lib/Badge.less

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

framework/core/src/Core/Notifications/Commands/ReadNotificationHandler.php

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

framework/core/views/app.blade.php

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