Update Polatch 2 to 2.3-407-g55bf495 build

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d987472531e5a147a64325f546936e6bc262e517..b512a404dc5a3c7604cd9dffbe4b8018e23f1771 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -113,7 +113,7 @@ class ApplicationController < ActionController::Base
 
   ##
   # require that the user is a moderator, or fill out a helpful error message
-  # and return them to the blocks index.
+  # and return them to the index for the controller this is wrapped from.
   def require_moderator
     unless @user.moderator?
       if request.get?
@@ -178,6 +178,10 @@ class ApplicationController < ActionController::Base
   # to be used as a before_filter *after* authorize. this checks that
   # the user is a moderator and, if not, returns a forbidden error.
   #
+  # NOTE: this isn't a very good way of doing it - it duplicates logic
+  # from require_moderator - but what we really need to do is a fairly
+  # drastic refactoring based on :format and respond_to? but not a 
+  # good idea to do that in this branch.
   def authorize_moderator(errormessage="Access restricted to moderators") 
     # check user is a moderator
     unless @user.moderator?
@@ -395,7 +399,10 @@ class ApplicationController < ActionController::Base
     @title = t "user.no_such_user.title"
     @not_found_user = name
 
-    render :template => "user/no_such_user", :status => :not_found
+    respond_to do |format|
+      format.html { render :template => "user/no_such_user", :status => :not_found }
+      format.all { render :nothing => true, :status => :not_found }
+    end
   end
   
 private