From 1ffbf21a961b93a33ea94b578a4260932f13414d Mon Sep 17 00:00:00 2001
From: elijah <elijah@riseup.net>
Date: Wed, 13 Feb 2013 00:10:09 -0800
Subject: switch order of respond_to for page controller, in case client has
 sent '*/*' for content type.

---
 app/controllers/pages_controller.rb | 4 ++--
 app/views/errors/error.atom         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 app/views/errors/error.atom

(limited to 'app')

diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 36c733b..acf525c 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -10,8 +10,8 @@ class PagesController < ApplicationController
     @page = site.find_pages(params[:page])
     if @page
       respond_to do |format|
+        format.html { render_page(@page) }
         format.atom { render_atom_feed(@page) }
-        format.all { render_page(@page) }
       end
     else
       raise PageNotFound.new
@@ -30,7 +30,7 @@ class PagesController < ApplicationController
 
   def render_atom_feed(root)
     if root
-      @pages = root.all_children.order_by(:posted_at, :direction => :desc).limit(PAGINATION_SIZE)
+      @pages = root.all_children.order_by(:posted_at, :direction => :desc).limit(site.pagination_size)
       if @pages.any?
         render :file => 'layouts/blog/feed', :layout => false, :content_type => 'application/atom+xml'
       else
diff --git a/app/views/errors/error.atom b/app/views/errors/error.atom
new file mode 100644
index 0000000..760589c
--- /dev/null
+++ b/app/views/errors/error.atom
@@ -0,0 +1 @@
+error
\ No newline at end of file
-- 
cgit v1.2.3