diff --git a/framework/core/js/forum/src/components/post-activity.js b/framework/core/js/forum/src/components/post-activity.js index dd52e46a2..6c6b2a938 100644 --- a/framework/core/js/forum/src/components/post-activity.js +++ b/framework/core/js/forum/src/components/post-activity.js @@ -4,14 +4,12 @@ import icon from 'flarum/helpers/icon'; import humanTime from 'flarum/utils/human-time'; export default class PostActivity extends Post { - view(content, attrs) { - attrs.className = 'post-activity '+(attrs.className || ''); - - var iconName = attrs.icon; - delete attrs.icon; - + view(iconName, content, attrs) { var post = this.props.post; + attrs = attrs || {}; + attrs.className = 'post-activity post-'+post.contentType()+' '+(attrs.className || ''); + return super.view([ icon(iconName+' post-icon'), m('div.post-activity-info', [ diff --git a/framework/core/js/forum/src/components/post-discussion-renamed.js b/framework/core/js/forum/src/components/post-discussion-renamed.js index ac65bf0c0..b54675109 100644 --- a/framework/core/js/forum/src/components/post-discussion-renamed.js +++ b/framework/core/js/forum/src/components/post-discussion-renamed.js @@ -6,9 +6,6 @@ export default class PostDiscussionRenamed extends PostActivity { var oldTitle = post.content()[0]; var newTitle = post.content()[1]; - return super.view(['changed the title from ', m('strong.old-title', oldTitle), ' to ', m('strong.new-title', newTitle), '.'], { - className: 'post-discussion-renamed', - icon: 'pencil' - }); + return super.view('pencil', ['changed the title from ', m('strong.old-title', oldTitle), ' to ', m('strong.new-title', newTitle), '.']); } } diff --git a/framework/core/src/Support/AssetManager.php b/framework/core/src/Support/AssetManager.php index 16dd28016..be50e0d6f 100644 --- a/framework/core/src/Support/AssetManager.php +++ b/framework/core/src/Support/AssetManager.php @@ -84,6 +84,7 @@ class AssetManager $lastModTime = max($lastModTime, filemtime($file)); } $debug = 0; + // $debug = 1; if (! file_exists($file = $dir.'/'.$this->name.'-'.$revision.'.'.$type) || filemtime($file) < $lastModTime