Merge "Add language handling to imageinfo/extmetadata API"

diff --combined docs/hooks.txt
index da7edbe,3f88bf5..84888d2
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -432,10 -432,6 +432,10 @@@ sites general information
  $module: the current ApiQuerySiteInfo module
  &$results: array of results, add things here
  
 +'APIQuerySiteInfoStatisticsInfo': Use this hook to add extra information to the
 +sites statistics information.
 +&$results: array of results, add things here
 +
  'APIQueryUsersTokens': Use this hook to add custom token to list=users. Every
  token has an action, which will be used in the ustoken parameter and in the
  output (actiontoken="..."), and a callback function which should return the
@@@ -866,6 -862,10 +866,6 @@@ etc
  'DatabaseOraclePostInit': Called after initialising an Oracle database
  &$db: the DatabaseOracle object
  
 -'Debug': Called when outputting a debug log line via wfDebug() or wfDebugLog()
 -$text: plaintext string to be output
 -$group: null or a string naming a logging group (as defined in $wgDebugLogGroups)
 -
  'NewDifferenceEngine': Called when a new DifferenceEngine object is made
  $title: the diff page title (nullable)
  &$oldId: the actual old Id to use in the diff
@@@ -1162,6 -1162,9 +1162,9 @@@ underscore) magic words. Called by Magi
  'value' => prop value, 'source' => 'name of hook' ).
  $file: File object of file in question
  $context: RequestContext (including language to use)
+ $single: Only extract the current language; if false, the prop value should
+ be in the metadata multi-language array format:
+ mediawiki.org/wiki/Manual:File_metadata_handling#Multi-language_array_format
  &$maxCacheTime: how long the results can be cached
  
  'GetFullURL': Modify fully-qualified URLs used in redirects/export/offsite data.
@@@ -2372,11 -2375,6 +2375,11 @@@ $special: the special page objec
  &$fields: array of query fields
  $values: array of variables with watchlist options
  
 +'SpecialWatchlistGetNonRevisionTypes': Called when building sql query for
 +SpecialWatchlist. Allows extensions to register custom values they have 
 +inserted to rc_type so they can be returned as part of the watchlist.
 +&$nonRevisionTypes: array of values in the rc_type field of recentchanges table
 +
  'TestCanonicalRedirect': Called when about to force a redirect to a canonical
  URL for a title when we have no other parameters on the URL. Gives a chance for
  extensions that alter page view behavior radically to abort that redirect or
@@@ -2586,7 -2584,6 +2589,7 @@@ $user: User (object) whose permission i
  'UserClearNewTalkNotification': Called when clearing the "You have new
  messages!" message, return false to not delete it.
  $user: User (object) that will clear the message
 +$oldid: ID of the talk page revision being viewed (0 means the most recent one)
  
  'UserComparePasswords': Called when checking passwords, return false to
  override the default password checks.