diff options
author | Philip Arndt <parndt@gmail.com> | 2011-11-10 09:23:02 +1300 |
---|---|---|
committer | Philip Arndt <parndt@gmail.com> | 2011-11-10 09:23:02 +1300 |
commit | f9f56c6f1c5ee277f5b0a335ca12a4eea275d42d (patch) | |
tree | 37bccbf5da9e688e5d6c8be5d3f10d03c4c25e75 /app/controllers/refinery/blog | |
parent | 81475ff3809d83e46ff28f39523abfc5cb1635a4 (diff) | |
parent | 12164fd95a1884a340283554ed5dbeedce916b80 (diff) | |
download | refinerycms-blog-f9f56c6f1c5ee277f5b0a335ca12a4eea275d42d.tar.gz refinerycms-blog-f9f56c6f1c5ee277f5b0a335ca12a4eea275d42d.tar.bz2 refinerycms-blog-f9f56c6f1c5ee277f5b0a335ca12a4eea275d42d.zip |
Merge branch 'master' into rails-3-1
Conflicts:
app/controllers/admin/blog/posts_controller.rb
app/controllers/blog/posts_controller.rb
Diffstat (limited to 'app/controllers/refinery/blog')
-rw-r--r-- | app/controllers/refinery/blog/posts_controller.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/controllers/refinery/blog/posts_controller.rb b/app/controllers/refinery/blog/posts_controller.rb index d3cd7a1..1c8cffd 100644 --- a/app/controllers/refinery/blog/posts_controller.rb +++ b/app/controllers/refinery/blog/posts_controller.rb @@ -1,7 +1,7 @@ module Refinery module Blog class PostsController < BaseController - + caches_page :index before_filter :find_all_blog_posts, :except => [:archive] @@ -12,7 +12,7 @@ module Refinery def index # Rss feeders are greedy. Let's give them every blog post instead of paginating. - (@blog_posts = Refinery::Blog::Post.live.includes(:comments, :categories).all) if request.format.rss? + (@blog_posts = Refinery::Blog::Post.live.includes(:comments, :categories).all) if request.format.rss? respond_with (@blog_posts) do |format| format.html format.rss @@ -22,6 +22,8 @@ module Refinery def show @blog_comment = Refinery::Blog::Comment.new + @canonical = url_for(:locale => ::Refinery::I18n.default_frontend_locale) if canonical? + respond_with (@blog_post) do |format| format.html { present(@blog_post) } format.js { render :partial => 'post', :layout => false } @@ -71,6 +73,10 @@ module Refinery @tag_name = @tag.name @blog_posts = Refinery::Blog::Post.tagged_with(@tag_name).page(params[:page]) end + + def canonical? + ::Refinery.i18n_enabled? && ::Refinery::I18n.default_frontend_locale != ::Refinery::I18n.current_frontend_locale + end end end end |