Merge "Pass the search term into the SpecialSearchResultsAppend hook"

diff --combined docs/hooks.txt
index bf595e4,a36e314..717dd39
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -2907,6 -2907,7 +2907,7 @@@ $term: Search term specified by the use
  on the search results page.  Useful for including a feedback link.
  $specialSearch: SpecialSearch object ($this)
  $output: $wgOut
+ $term: Search term specified by the user
  
  'SpecialSearchSetupEngine': Allows passing custom data to search engine.
  $search: SpecialSearch special page object
@@@ -3292,26 -3293,6 +3293,26 @@@ when UserMailer sends an email, with a 
  $to: Array of MailAddress objects for the recipients
  &$returnPath: The return address string
  
 +'UserMailerSplitTo': Called in UserMailer::send() to give extensions a chance
 +to split up an email with multiple the To: field into separate emails.
 +$to: array of MailAddress objects; unset the ones which should be mailed separately
 +
 +'UserMailerTransformContent': Called in UserMailer::send() to change email contents.
 +Extensions can block sending the email by returning false and setting $error.
 +$to: array of MailAdresses of the targets
 +$from: MailAddress of the sender
 +&$body: email body, either a string (for plaintext emails) or an array with 'text' and 'html' keys
 +&$error: should be set to an error message string
 +
 +'UserMailerTransformMessage': Called in UserMailer::send() to change email after it has gone through
 +the MIME transform. Extensions can block sending the email by returning false and setting $error.
 +$to: array of MailAdresses of the targets
 +$from: MailAddress of the sender
 +&$subject: email subject (not MIME encoded)
 +&$headers: email headers (except To: and Subject:) as an array of header name => value pairs
 +&$body: email body (in MIME format) as a string
 +&$error: should be set to an error message string
 +
  'UserRemoveGroup': Called when removing a group; return false to override stock
  group removal.
  $user: the user object that is to have a group removed