app/controllers/blog_controller.rb in spud_blog-0.8.18 vs app/controllers/blog_controller.rb in spud_blog-0.9.0

- old
+ new

@@ -6,15 +6,15 @@ before_filter :find_post, :only => :show caches_action :show, :index, :expires => Spud::Blog.config.action_caching_duration, :if => Proc.new{ |c| - Spud::Blog.config.enable_action_caching && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => false).future_posts.count == 0) + Spud::Blog.cache_mode == :action && !(c.params[:page] && c.params[:page].to_i > 1) && (SpudPost.where(:is_news => false).future_posts.count == 0) } after_filter :only => [:show, :index] do |c| - if Spud::Blog.enable_full_page_caching && !(c.params[:page] && c.params[:page].to_i > 1) + if Spud::Blog.cache_mode == :full_page && !(c.params[:page] && c.params[:page].to_i > 1) if (SpudPost.where(:is_news => false).future_posts.count == 0) c.cache_page(nil, nil, false) end end end @@ -28,11 +28,9 @@ if(page.to_s != params[:page] && page > 1) redirect_to blog_path(:page => page),:status => :moved_permanently and return end end - - logger.debug("Page = #{page}") @posts = SpudPost.public_blog_posts(page, Spud::Blog.config.posts_per_page) if Spud::Core.config.multisite_mode_enabled @posts = @posts.for_spud_site(current_site_id) end respond_with @posts