6 files changed, 17 insertions, 5 deletions
diff --git a/app/controllers/admin_public_body_controller.rb b/app/controllers/admin_public_body_controller.rb
index e0da234b0..88e275960 100644
--- a/app/controllers/admin_public_body_controller.rb
+++ b/app/controllers/admin_public_body_controller.rb
@@ -143,6 +143,8 @@ class AdminPublicBodyController < AdminController
         @errors = ""
         if request.post?
             dry_run_only = (params['commit'] == 'Upload' ? false : true)
+            # (FIXME: both of these cases could now be changed to use
+            # PublicBody.import_csv_from_file.)
             # Read file from params
             if params[:csv_file]
                 csv_contents = params[:csv_file].read
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index e7bea67ef..00a3beebd 100644
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -200,7 +200,7 @@ class ApiController < ApplicationController
             ])
         end
         if feed_type == "atom"
-            render :template => "api/request_events.atom", :layout => false
+            render :template => "api/request_events", :formats => ['atom'], :layout => false
         elsif feed_type == "json"
             # For the JSON feed, we take a "since" parameter that allows the client
             # to restrict to events more recent than a certain other event
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index cbdffc441..161a82b26 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -138,7 +138,9 @@ class ApplicationController < ActionController::Base
             backtrace = Rails.backtrace_cleaner.clean(exception.backtrace, :silent)
             message << "  " << backtrace.join("\n  ")
             Rails.logger.fatal("#{message}\n\n")
-            ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver
+            if !AlaveteliConfiguration.exception_notifications_from.blank? && !AlaveteliConfiguration.exception_notifications_to.blank?
+                ExceptionNotifier::Notifier.exception_notification(request.env, exception).deliver
+            end
             @status = 500
         end
         respond_to do |format|
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index aac078829..b01a67027 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -17,6 +17,10 @@ class GeneralController < ApplicationController
 
     # Display blog entries
     def blog
+        if AlaveteliConfiguration::blog_feed.empty?
+            raise ActiveRecord::RecordNotFound.new("Page not enabled")
+        end
+
         medium_cache
         @feed_autodetect = []
         @feed_url = AlaveteliConfiguration::blog_feed
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb
index 841950cd5..d982bd391 100644
--- a/app/controllers/request_controller.rb
+++ b/app/controllers/request_controller.rb
@@ -958,8 +958,9 @@ class RequestController < ApplicationController
         end
         if !done
             file_info = { :filename => 'correspondence.txt',
-                          :data => render_to_string(:template => 'request/show.text',
-                                                    :layout => false) }
+                          :data => render_to_string(:template => 'request/show',
+                                                    :layout => false,
+                                                    :formats => [:text]) }
         end
         file_info
     end
diff --git a/app/controllers/track_controller.rb b/app/controllers/track_controller.rb
index 72c092221..1123903f9 100644
--- a/app/controllers/track_controller.rb
+++ b/app/controllers/track_controller.rb
@@ -160,7 +160,10 @@ class TrackController < ApplicationController
             format.json { render :json => @xapian_object.results.map { |r| r[:model].json_for_api(true,
                     lambda { |t| view_context.highlight_and_excerpt(t, @xapian_object.words_to_highlight, 150) }
                 ) } }
-            format.any { render :template => 'track/atom_feed.atom', :layout => false, :content_type => 'application/atom+xml' }
+            format.any { render :template => 'track/atom_feed',
+                                :formats => ['atom'],
+                                :layout => false,
+                                :content_type => 'application/atom+xml' }
         end
     end