Change to avoid conflicts, need to redo title system later

mikepack · Jun 24, 2010 · 3ddf30b · 3ddf30b
1 parent c3db5dc
commit 3ddf30b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/blog_posts_controller.rb b/app/controllers/blog_posts_controller.rb
@@ -12,7 +12,7 @@ class BlogPostsController < ApplicationController
 
   def index
     @blog_posts = BlogPost.published.paginate(:page => params[:page], :per_page => 5, :order => 'published_at DESC')
-    @page_title = BlogKit.instance.settings['blog_name'] || 'Blog'
+    @index_title = BlogKit.instance.settings['blog_name'] || 'Blog'
 
     respond_to do |format|
       format.html # index.html.erb
@@ -31,7 +31,7 @@ def tag
 			@blog_posts = []
 		end
 
-    @page_title = 'Tag: ' + @tag
+    @index_title = 'Tag: ' + @tag
     respond_to do |format|
       format.html { render :action => 'index' }
       format.xml  { render :xml => @blog_posts }

diff --git a/app/views/blog_posts/index.html.erb b/app/views/blog_posts/index.html.erb
@@ -1,4 +1,4 @@
-<% self.respond_to?(:title) && title(@page_title) -%>
+<% self.respond_to?(:title) && title(@index_title) -%>
 <% @show_title = false -%>
 <%= stylesheet_link_tag 'blog_kit' %>
 <%= stylesheet_link_tag 'syntax/' + (BlogKit.instance.settings['theme'] || 'mac_classic') %>