Merge "Add hook to allow extensions to modify query used by Special:ShortPages"

diff --combined docs/hooks.txt
index c928aae,f2f04f3..83ce62e
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -1094,7 -1094,6 +1094,7 @@@ diff view, i.e. undo, etc
  $newRev: Revision object of the "new" revision
  &$links: Array of HTML links
  $oldRev: Revision object of the "old" revision (may be null)
 +$user: Current user object
  
  'DiffViewHeader': Called before diff display
  $diff: DifferenceEngine object that's calling
@@@ -1555,8 -1554,6 +1555,8 @@@ Special:Version, use this to change th
  page history view, i.e. undo, rollback, etc.
  $rev: Revision object
  &$links: Array of HTML links
 +$prevRev: Revision object, next in line in page history, or null
 +$user: Current user object
  
  'HTMLFileCache::useFileCache': Override whether a page should be cached in file
  cache.
@@@ -1689,9 -1686,9 +1689,9 @@@ $rc: RecentChange object that triggere
  'IsFileCacheable': Override the result of Article::isFileCacheable() (if true)
  &$article: article (object) being checked
  
 -'IsTrustedProxy': Override the result of wfIsTrustedProxy()
 +'IsTrustedProxy': Override the result of IP::isTrustedProxy()
  &$ip: IP being check
 -&$result: Change this value to override the result of wfIsTrustedProxy()
 +&$result: Change this value to override the result of IP::isTrustedProxy()
  
  'IsUploadAllowedFromUrl': Override the result of UploadFromUrl::isAllowedUrl()
  $url: URL used to upload from
@@@ -2571,6 -2568,13 +2571,13 @@@ $enotif: EmailNotification objec
  
  'SetupAfterCache': Called in Setup.php, after cache objects are set
  
+ 'ShortPagesQuery': Allow extensions to modify the query used by
+ Special:ShortPages.
+ &$tables: tables to join in the query
+ &$conds: conditions for the query
+ &$joinConds: join conditions for the query
+ &$options: options for the query
+ 
  'ShowMissingArticle': Called when generating the output for a non-existent page.
  $article: The article object corresponding to the page
  
@@@ -3040,7 -3044,6 +3047,7 @@@ $user: user who does the mov
  $pageid: database ID of the page that's been moved
  $redirid: database ID of the created redirect
  $reason: reason for the move
 +$revision: the Revision created by the move
  
  'TitleMoveCompleting': After moving an article (title), pre-commit.
  $old: old title
@@@ -3049,7 -3052,6 +3056,7 @@@ $user: user who did the mov
  $pageid: database ID of the page that's been moved
  $redirid: database ID of the created redirect
  $reason: reason for the move
 +$revision: the Revision created by the move
  
  'TitleQuickPermissions': Called from Title::checkQuickPermissions to add to
  or override the quick permissions check.