Merge branch 'release/0.14' into wdtk

Conflicts:
    app/views/request/show.html.erb

1 files changed, 2 insertions, 3 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 0bccd3358..8b606ea85 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,7 +17,7 @@ class AdminController < ApplicationController
     end
 
     # Always give full stack trace for admin interface
-    def local_request?
+    def show_rails_exceptions?
         true
     end
 
@@ -29,8 +29,7 @@ class AdminController < ApplicationController
         FileUtils.rm_rf(cache_subpath)
 
         # Remove any download zips
-        download_dir = request_download_zip_dir(info_request)
-        FileUtils.rm_rf(download_dir)
+        FileUtils.rm_rf(info_request.download_zip_dir)
 
         # Remove the database caches of body / attachment text (the attachment text
         # one is after privacy rules are applied)