diff options
| author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-12 09:20:43 +0100 |
|---|---|---|
| committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-12 09:20:43 +0100 |
| commit | 54fc48b9b66ce29f660064fbea3e71ea15b61d58 (patch) | |
| tree | 85269b9ef4f62bce2393134981edf30adf370b05 /app/controllers/application_controller.rb | |
| parent | dc14834a5d85032645f3a410faae68089fb5fe1a (diff) | |
| parent | 04653b52f2233c9b4fea6b690d16a825b974d36d (diff) | |
Merge branch 'release/0.6' of github.com:sebbacon/alaveteli into release/0.6
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e305e90f4..41adf1848 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -202,7 +202,7 @@ class ApplicationController < ActionController::Base # return stub path so admin can expire it first_three_digits = info_request.id.to_s()[0..2] path = "views/request/#{first_three_digits}/#{info_request.id}" - foi_cache_path = File.join(File.dirname(__FILE__), '../../cache') + foi_cache_path = File.expand_path(File.join(File.dirname(__FILE__), '../../cache')) return File.join(foi_cache_path, path) end def foi_fragment_cache_exists?(key_path) @@ -345,9 +345,6 @@ class ApplicationController < ActionController::Base return "*unknown*"; end end - def assign_http_auth_user - @http_auth_user = admin_http_auth_user - end # Convert URL name for sort by order, to Xapian query def order_to_sort_by(sortby) |