Merge "Add TitleQuickPermissions hook to Title::checkQuickPermissions"

diff --combined docs/hooks.txt
index 3c77985,f128efd..66b5068
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -615,7 -615,6 +615,7 @@@ the user is redirected back to the page
  
  'ArticleViewFooter': After showing the footer section of an ordinary page view
  $article: Article object
 +$patrolFooterShown: boolean whether patrol footer is shown
  
  'ArticleViewHeader': Before the parser cache is about to be tried for article
  viewing.
@@@ -2112,6 -2111,8 +2112,6 @@@ $checkEdit: Whether or not the action=e
  &$text: Link text.
  &$result: Complete assoc. array if you want to return true.
  
 -'SkinTemplateTabs': TODO
 -
  'SkinTemplateToolboxEnd': Called by SkinTemplate skins after toolbox links have
  been rendered (useful for adding more).
  $sk: The QuickTemplate based skin template running the hook.
@@@ -2331,6 -2332,15 +2331,15 @@@ database result
  &$titleArray: set this to an object to override the default object returned
  $res: database result used to create the object
  
+ 'TitleQuickPermissions': Called from Title::checkQuickPermissions to add to
+ or override the quick permissions check.
+ $title: The Title object being accessed
+ $user: The User performing the action
+ $action: Action being performed
+ &$errors: Array of errors
+ $doExpensiveQueries: Whether to do expensive DB queries
+ $short: Whether to return immediately on first error
+ 
  'TitleGetRestrictionTypes': Allows extensions to modify the types of protection
  that can be applied.
  $title: The title in question.