Merge pull request #81 from adamcrown/master

Rails 3.1 fixes
neerajsingh0101 · Oct 14, 2011 · 932de43 · 932de43
2 parents d0702bc + e9604ec
commit 932de43
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/app/controllers/admin_data/public_controller.rb b/app/controllers/admin_data/public_controller.rb
@@ -8,20 +8,20 @@ def serve
         render :nothing => true, :status => 404 and return
       end
 
-      case params[:file]
-      when /\.css$/i
+      case params[:format].to_s.downcase
+      when 'css'
         content_type = "text/css"
-      when /\.js$/i
+      when 'js'
         content_type = "text/javascript"
-      when /\.png$/i
+      when 'png'
         content_type = "image/png"
-      when /\.jpg$/i
+      when 'jpg'
         content_type = "image/jpg"
       else
         render :nothing => true, :status => 404 and return
       end
 
-      render({:text => File.read(path), :cache => true, :content_type => content_type})
+      render({:text => File.read("#{path}.#{params[:format]}"), :cache => true, :content_type => content_type})
     end
 
   end

diff --git a/app/helpers/admin_data/application_helper.rb b/app/helpers/admin_data/application_helper.rb
@@ -23,7 +23,7 @@ def get_sort_class(column)
     end
 
     def parent_layout(layout)
-      @_content_for[:layout] = self.output_buffer
+      content_for(:layout, self.output_buffer)
       self.output_buffer = render(:file => "layouts/#{layout}")
     end