lib/wisepdf/render.rb in wisepdf-1.2.1 vs lib/wisepdf/render.rb in wisepdf-1.2.2

@@ -39,15 +39,15 @@
         @hf_tempfiles.each { |tf| tf.close! }
       end
     end
     
     def default_pdf_render_options
-      Wisepdf::Configuration.options.merge({
+      {
         :wkhtmltopdf => nil,
         :layout => false,
         :template => "#{controller_path}/#{action_name}",
-        :disposition => "inline"              
-      })
+        :disposition => "inline"                      
+      }.merge(Wisepdf::Configuration.options)
     end
     
     def make_pdf(options = {})
       options = self.prerender_header_and_footer(options)            
       html = render_to_string(:template => options[:template], :layout => options[:layout])            
\ No newline at end of file