Merge branch 'release/1.0.0'

CHANGELOG.md

@@ -1,8 +1,13 @@
 # Changelog
 
+## 1.0.0 (April 13, 2016)
+
+### Fixed
+- Add roles check to feed action
+
 ## 0.11.2 (April 7, 2016)
 
-### FIXED
+### Fixed
 - Fixed update URL after comment
 - Fixed different prefixes with SQLLite
 - Fixed SQLite collations

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "pagekit/blog",
     "type": "pagekit-extension",
-    "version": "0.11.2",
+    "version": "1.0.0",
     "title": "Blog",
     "description": "A blog extensions with a built-in comment system.",
     "license": "MIT",

src/Controller/SiteController.php

@@ -95,7 +95,9 @@ public function feedAction($type = '')
             $feed->setDate($last->modified);
         }
 
-        foreach (Post::where(['status = ?', 'date < ?'], [Post::STATUS_PUBLISHED, new \DateTime])->related('user')->limit($this->blog->config('feed.limit'))->orderBy('date', 'DESC')->get() as $post) {
+        foreach (Post::where(['status = ?', 'date < ?'], [Post::STATUS_PUBLISHED, new \DateTime])->where(function ($query) {
+            return $query->where('roles IS NULL')->whereInSet('roles', App::user()->roles, false, 'OR');
+        })->related('user')->limit($this->blog->config('feed.limit'))->orderBy('date', 'DESC')->get() as $post) {
             $url = App::url('@blog/id', ['id' => $post->id], 0);
             $feed->addItem(
                 $feed->createItem([

src/Model/PostModelTrait.php

@@ -18,10 +18,7 @@ public static function updateCommentInfo($id)
     {
         $query = Comment::where(['post_id' => $id, 'status' => Comment::STATUS_APPROVED]);
 
-        self::where(compact('id'))->update([
-                'comment_count' => $query->count()
-            ]
-        );
+        self::where(compact('id'))->update(['comment_count' => $query->count()]);
     }
 
     /**