Merge branch 'master' into rails4

Conflicts:
	app/helpers/refinery/blog/controller_helper.rb
	app/models/refinery/blog/post.rb

1 files changed, 17 insertions, 26 deletions

diff --git a/app/helpers/refinery/blog/controller_helper.rb b/app/helpers/refinery/blog/controller_helper.rb
index 75c351a..4bec046 100644
--- a/app/helpers/refinery/blog/controller_helper.rb
+++ b/app/helpers/refinery/blog/controller_helper.rb
@@ -4,37 +4,28 @@ module Refinery
 
       protected
 
-      def find_blog_post
-        @post = all_blog_posts.friendly.find(params[:id])
-        unless @post.try(:live?)
-          if refinery_user? && current_refinery_user.authorized_plugins.include?("refinerycms_blog")
-            @post = Post.friendly.find(params[:id])
-          else
-            error_404
+        def find_blog_post
+          @post = all_blog_posts.friendly.find(params[:id])
+          unless @post.try(:live?)
+            if refinery_user? && current_refinery_user.authorized_plugins.include?("refinerycms_blog")
+              @post = Post.friendly.find(params[:id])
+            else
+              error_404
+            end
           end
         end
-      end
 
-      def find_all_blog_posts
-        @posts = all_blog_posts.live
-      end
-
-      def paginate_all_blog_posts
-        @posts = find_all_blog_posts.page(params[:page])
-      end
-
-      def find_tags
-        @tags = Post.tag_counts_on(:tags)
-      end
+        def find_all_blog_posts
+          @posts = all_blog_posts.live
+        end
 
-      def find_all_blog_categories
-        @categories = Category.translated
-      end
+        def find_tags
+          @tags = Refinery::Blog::Post.live.tag_counts_on(:tags)
+        end
 
-      private
-      def all_blog_posts
-        Post.newest_first.includes(:comments, :categories).with_globalize
-      end
+        def find_all_blog_categories
+          @categories = Refinery::Blog::Category.translated
+        end
     end
   end
 end