Merge branch 'release/0.6.3' into wdtk

Conflicts:
    app/controllers/admin_request_controller.rb
    app/views/request/show.rhtml
    spec/models/info_request_spec.rb

1 files changed, 4 insertions, 0 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index eb6c9c7f7..40fa018aa 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -27,6 +27,7 @@ class ApplicationController < ActionController::Base
     before_filter :check_in_post_redirect
     before_filter :session_remember_me
     before_filter :set_vary_header
+    before_filter :set_popup_banner
 
     # scrub sensitive parameters from the logs
     filter_parameter_logging :password
@@ -556,6 +557,9 @@ class ApplicationController < ActionController::Base
         return country
     end
 
+    def set_popup_banner
+        @popup_banner = render_to_string(:partial => "general/popup_banner").strip
+    end
     # URL generating functions are needed by all controllers (for redirects),
     # views (for links) and mailers (for use in emails), so include them into
     # all of all.