summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/tags_controller.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index d235601..473dce4 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -8,11 +8,12 @@ class TagsController < ApplicationController
8 def show 8 def show
9 @tag = Tag.find_by_name(params[:id]) 9 @tag = Tag.find_by_name(params[:id])
10 10
11 tag_name = @tag ? @tag.name : nil 11 @tag = @tag ? @tag.name : params[:id]
12 12
13 @page = Page.new 13 @page = Page.new
14
14 @pages = Page.heads.paginate( 15 @pages = Page.heads.paginate(
15 Page.find_options_for_find_tagged_with(tag_name).merge( 16 Page.find_options_for_find_tagged_with(@tag).merge(
16 :order => 'published_at DESC', 17 :order => 'published_at DESC',
17 :page=>params[:page], 18 :page=>params[:page],
18 :per_page => 23 19 :per_page => 23