Merge "New hook for filters on Special:Contributions form"

diff --combined docs/hooks.txt
index a2b8592,9aacaa9..24eb868
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -741,8 -741,9 +741,8 @@@ viewing
  redirect was followed.
  &$article: target article (object)
  
 -'AuthPluginAutoCreate': DEPRECATED! Use the 'LocalUserCreated' hook instead.
 -Called when creating a local account for an user logged in from an external
 -authentication method.
 +'AuthPluginAutoCreate': Called when creating a local account for an user logged
 +in from an external authentication method.
  $user: User object created locally
  
  'AuthPluginSetup': Update or replace authentication plugin object ($wgAuth).
@@@ -2345,11 -2346,6 +2345,11 @@@ run. Use when page save hooks require t
  that tests continue to run properly.
  &$tables: array of table names
  
 +'ParserOutputStashForEdit': Called when an edit stash parse finishes, before the output is cached.
 +$page: the WikiPage of the candidate edit
 +$content: the Content object of the candidate edit
 +$output: the ParserOutput result of the candidate edit
 +
  'PasswordPoliciesForUser': Alter the effective password policy for a user.
  $user: User object whose policy you are modifying
  &$effectivePolicy: Array of policy statements that apply to this user
@@@ -2584,6 -2580,20 +2584,6 @@@ $targetUser: the user whom to send watc
  $title: the page title
  $enotif: EmailNotification object
  
 -'SessionCheckInfo': Validate a MediaWiki\Session\SessionInfo as it's being
 -loaded from storage. Return false to prevent it from being used.
 -&$reason: String rejection reason to be logged
 -$info: MediaWiki\Session\SessionInfo being validated
 -$request: WebRequest being loaded from
 -$metadata: Array|false Metadata array for the MediaWiki\Session\Session
 -$data: Array|false Data array for the MediaWiki\Session\Session
 -
 -'SessionMetadata': Add metadata to a session being saved.
 -$backend: MediaWiki\Session\SessionBackend being saved.
 -&$metadata: Array Metadata to be stored. Add new keys here.
 -$requests: Array of WebRequests potentially being saved to. Generally 0-1 real
 -  request and 0+ FauxRequests.
 -
  'SetupAfterCache': Called in Setup.php, after cache objects are set
  
  'ShortPagesQuery': Allow extensions to modify the query used by
@@@ -2783,6 -2793,11 +2783,11 @@@ $id: User id number, only provided for 
  $user: User object representing user contributions are being fetched for
  $sp: SpecialPage instance, providing context
  
+ 'SpecialContributions::getForm::filters': Called with a list of filters to render
+ on Special:Contributions.
+ $sp: SpecialContributions object, for context
+ &$filters: List of filters rendered as HTML
+ 
  'SpecialListusersDefaultQuery': Called right before the end of
  UsersPager::getDefaultQuery().
  $pager: The UsersPager instance
@@@ -3302,8 -3317,9 +3307,8 @@@ $name: user nam
  $user: user object
  &$s: database query object
  
 -'UserLoadFromSession': DEPRECATED! Create a MediaWiki\Session\SessionProvider instead.
 -Called to authenticate users on external/environmental means; occurs before
 -session is loaded.
 +'UserLoadFromSession': Called to authenticate users on external/environmental
 +means; occurs before session is loaded.
  $user: user object being loaded
  &$result: set this to a boolean value to abort the normal authentication
    process
@@@ -3394,9 -3410,13 +3399,9 @@@ $user: User objec
  'UserSaveSettings': Called when saving user settings.
  $user: User object
  
 -'UserSetCookies': DEPRECATED! If you're trying to replace core session cookie
 -handling, you want to create a subclass of MediaWiki\Session\CookieSessionProvider
 -instead. Otherwise, you can no longer count on user data being saved to cookies
 -versus some other mechanism.
 -Called when setting user cookies.
 +'UserSetCookies': Called when setting user cookies.
  $user: User object
 -&$session: session array, will be added to the session
 +&$session: session array, will be added to $_SESSION
  &$cookies: cookies array mapping cookie name to its value
  
  'UserSetEmail': Called when changing user email address.