Implement context menu with: directions, add note, describe, centre.

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 43afdf74f5c3a861f8b2abe90179e4a584fe73ce..618f08a1fc84e3fb6281d15b4dca21f6addfc5e1 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery
 
-  before_filter :fetch_body
+  before_action :fetch_body
 
   def authorize_web
     if session[:user]
@@ -272,7 +272,7 @@ class ApplicationController < ActionController::Base
   #  phrase from that, we can also put the error message into the status
   #  message. For now, rails won't let us)
   def report_error(message, status = :bad_request)
-    # Todo: some sort of escaping of problem characters in the message
+    # TODO: some sort of escaping of problem characters in the message
     response.headers["Error"] = message
 
     if request.headers["X-Error-Format"] &&
@@ -389,12 +389,6 @@ class ApplicationController < ActionController::Base
     render :action => "timeout"
   end
 
-  ##
-  # is the requestor logged in?
-  def logged_in?
-    !@user.nil?
-  end
-
   ##
   # ensure that there is a "this_user" instance variable
   def lookup_this_user