merge changes upstream

1 files changed, 5 insertions, 0 deletions

diff --git a/lib/model_patches.rb b/lib/model_patches.rb
index a4ca42e..4993c37 100644
--- a/lib/model_patches.rb
+++ b/lib/model_patches.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Add a callback - to be executed before each request in development,
 # and at startup in production - to patch existing app classes.
 # Doing so in init/environment.rb wouldn't work in development, since
@@ -10,6 +11,10 @@ Rails.configuration.to_prepare do
   # OutgoingMessage.class_eval do
   #   # Add intro paragraph to new request template
   #   def default_letter
+  #     # this line allows the default_letter text added by this
+  #     # method to be replaced by the value supplied by the API
+  #     # e.g. http://demo.alaveteli.org/new/tgq?default_letter=this+is+a+test
+  #     return @default_letter if @default_letter
   #     return nil if self.message_type == 'followup'
   #     "If you uncomment this line, this text will appear as default text in every message"
   #   end