Merge branch 'wdtk' into develop

Conflicts:
    app/controllers/admin_request_controller.rb
    config/httpd.conf
    spec/models/info_request_spec.rb

1 files changed, 3 insertions, 0 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a124743b2..7b5eb5590 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -213,13 +213,16 @@ class ApplicationController < ActionController::Base
         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)
         return File.exists?(key_path)
     end
+
     def foi_fragment_cache_read(key_path)
         logger.info "Reading from fragment cache #{key_path}"
         return File.read(key_path)
     end
+
     def foi_fragment_cache_write(key_path, content)
         FileUtils.mkdir_p(File.dirname(key_path))
         logger.info "Writing to fragment cache #{key_path}"