1 files changed, 17 insertions, 6 deletions
diff --git a/app/controllers/blog/posts_controller.rb b/app/controllers/blog/posts_controller.rb
index f7b6f3c..576073e 100644
--- a/app/controllers/blog/posts_controller.rb
+++ b/app/controllers/blog/posts_controller.rb
@@ -45,12 +45,23 @@ class Blog::PostsController < BlogController
   end
 
   def archive
-    date = "#{params[:month]}/#{params[:year]}"
-    @archive_date = Time.parse(date)
-    @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
-      :page => params[:page],
-      :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
-    })
+    if params[:month].present?
+      date = "#{params[:month]}/#{params[:year]}"
+      @archive_date = Time.parse(date)
+      @date_title = @archive_date.strftime('%B %Y')
+      @blog_posts = BlogPost.live.by_archive(@archive_date).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    else
+      date = "01/#{params[:year]}"
+      @archive_date = Time.parse(date)
+      @date_title = @archive_date.strftime('%Y')
+      @blog_posts = BlogPost.live.by_year(@archive_date).paginate({
+        :page => params[:page],
+        :per_page => RefinerySetting.find_or_set(:blog_posts_per_page, 10)
+      })
+    end
     respond_with (@blog_posts)
   end