From 8dbd51734ab7f341575b7f9fa18478763d3fbd3d Mon Sep 17 00:00:00 2001
From: Mario Visic <mario@mariovisic.com>
Date: Sun, 4 Sep 2011 01:15:43 +0800
Subject: [PATCH] Visiting /edit when not authenticated now sends users to the
 login page.

---
 app/controllers/admin/rendering_controller.rb | 7 +++++++
 config/routes.rb                              | 2 +-
 lib/locomotive/render.rb                      | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/rendering_controller.rb b/app/controllers/admin/rendering_controller.rb
index 5c21a359..2d92200a 100644
--- a/app/controllers/admin/rendering_controller.rb
+++ b/app/controllers/admin/rendering_controller.rb
@@ -6,10 +6,17 @@ module Admin
     include Locomotive::Render
 
     before_filter :require_site
+    before_filter :authenticate_admin!, :only => [:edit]
+    before_filter :validate_site_membership, :only => [:edit]
 
     def show
       render_locomotive_page
     end
 
+    def edit
+      @editing = true
+      render_locomotive_page
+    end
+
   end
 end
diff --git a/config/routes.rb b/config/routes.rb
index b186b5c3..02caffad 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -65,6 +65,6 @@ Rails.application.routes.draw do
 
   # magic urls
   match '/' => 'admin/rendering#show'
-  match '*path/edit' => 'admin/rendering#show', :defaults => { :editing => true }
+  match '*path/edit' => 'admin/rendering#edit'
   match '*path' => 'admin/rendering#show'
 end
diff --git a/lib/locomotive/render.rb b/lib/locomotive/render.rb
index c8294293..d17d2d20 100644
--- a/lib/locomotive/render.rb
+++ b/lib/locomotive/render.rb
@@ -111,7 +111,7 @@ module Locomotive
       end
 
       def editing_page?
-        self.params[:editing] == true && current_admin
+        @editing
       end
 
       def page_status