From 2dd06266db484415880af7418bcf2591ac008c55 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Mon, 25 Apr 2011 16:20:07 +0900
Subject: [PATCH] fixes #97 _paginate.html.erb isn't rendered with custom theme

---
 CHANGELOG                         | 11 ++++++++++-
 lib/kaminari/helpers/paginator.rb |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 515973a..1c34f3e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+== 0.12.1
+
+* Slim template support #93 [detrain]
+
+* Use Kaminari.config to specify default value for param_name #94 [avsej]
+
+* Fixed "super called outside of method" error happened in particular versions
+of Ruby 1.8.7 #91 [Skulli]
+
 == 0.12.0
 
 * General configuration options #41 #62 [javierv, iain]
@@ -6,7 +15,7 @@
   Also, here comes a generator command that generates the default
   configuration file into your app's config/initilizers directory.
 
-* Generic pagination support for Array object #47 #68 #74 [lda ened jianlin]
+* Generic pagination support for Array object #47 #68 #74 [lda, ened, jianlin]
   You can now paginate through any kind of Arrayish object in this way:
     Kaminari.paginate_array(my_array_object).page(params[:page]).per(10)
 
diff --git a/lib/kaminari/helpers/paginator.rb b/lib/kaminari/helpers/paginator.rb
index fd37075..915696f 100644
--- a/lib/kaminari/helpers/paginator.rb
+++ b/lib/kaminari/helpers/paginator.rb
@@ -14,6 +14,7 @@ module Kaminari
           h[:right] = outer_window if h[:right] == 0
         end
         @template, @options = template, options
+        @theme = @options[:theme] ? "#{@options[:theme]}/" : ''
         @options[:current_page] = PageProxy.new @window_options.merge(@options), @options[:current_page], nil
         # so that this instance can actually "render". Black magic?
         @output_buffer = ActionView::OutputBuffer.new