Mercurial > hg > soundsoftware-site

diff app/controllers/application_controller.rb @ 85:22c68d60853d cannam

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "live"
author Chris Cannam
date Thu, 16 Dec 2010 10:07:06 +0000
parents aea1779e6f18
children b859cc0c4fa1 4b1a23d81683
line wrap: on
line diff
--- a/app/controllers/application_controller.rb	Thu Dec 16 10:03:20 2010 +0000
+++ b/app/controllers/application_controller.rb	Thu Dec 16 10:07:06 2010 +0000
@@ -314,7 +314,7 @@
     if api_request?
       logger.error "Form authenticity token is missing or is invalid. API calls must include a proper Content-type header (text/xml or text/json)."
     end
-    render_error "Invalid form authenticity token."
+    render_error "Invalid form authenticity token.  Perhaps your session has timed out; try reloading the form and entering your details again."
   end
   
   def render_feed(items, options={})