diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-10-25 18:00:38 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-10-25 18:00:38 +0100 |
| commit | bec84a144eda607404c2db676b61a486610e51f7 (patch) | |
| tree | 244742f573a1475a4c0f19ebe334afb630764f17 | |
| parent | 3d3aeca9a522bb25769c6a86c5a8522719a911c1 (diff) | |
Handle the default blank string passed by Configuration module
| -rw-r--r-- | app/controllers/request_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/info_request.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/request_controller.rb b/app/controllers/request_controller.rb index 428dc4c23..c732a4b32 100644 --- a/app/controllers/request_controller.rb +++ b/app/controllers/request_controller.rb @@ -44,7 +44,7 @@ class RequestController < ApplicationController end def show - if !Configuration::varnish_host.nil? + if !Configuration::varnish_host.blank? # If varnish is set up to accept PURGEs, then cache for a # long time long_cache diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 47424e573..89893a396 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -1139,7 +1139,7 @@ public before_save :purge_in_cache def purge_in_cache - if !Configuration::varnish_host.nil? && !self.id.nil? + if !Configuration::varnish_host.blank? && !self.id.nil? # we only do this for existing info_requests (new ones have a nil id) path = url_for(:controller => 'request', :action => 'show', :url_title => self.url_title, :only_path => true, :locale => :none) req = PurgeRequest.find_by_url(path) |