From d626148a83552fa81624f75b23d539f45ec6354e Mon Sep 17 00:00:00 2001
From: Diaspora Europe <info@diasp.eu>
Date: Fri, 16 Mar 2012 18:58:01 +0100
Subject: [PATCH] fix will paginate renderer

---
 config/initializers/will_paginate.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/initializers/will_paginate.rb b/config/initializers/will_paginate.rb
index 69626fd72..966b1da5c 100644
--- a/config/initializers/will_paginate.rb
+++ b/config/initializers/will_paginate.rb
@@ -5,7 +5,11 @@ require 'will_paginate/array'
 
 module WillPaginate
   module ActionView
-    def will_paginate(collection = nil, options = { :renderer => WillPaginate::ActionView::LinkRenderer } )
+    def will_paginate(collection = nil, options = {} )
+      options, collection = collection, nil if collection.is_a? Hash
+      # Taken from original will_paginate code to handle if the helper is not passed a collection object.
+      collection ||= infer_collection_from_controller
+      options[:renderer] ||= WillPaginate::ActionView::LinkRenderer
       super.try :html_safe
     end