Merge "Add new 'ArticleShowPatrolFooter' hook to allow extensions to decide if the...

diff --combined RELEASE-NOTES-1.32
index 02a1b89,df3d3d7..18ddc2f
--- 1/RELEASE-NOTES-1.32
--- 2/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@@ -48,6 -48,9 +48,9 @@@ production
  * The 'ImageBeforeProduceHTML' hook is now passed three new parameters, $parser,
    &$query and &$widthOption, allowing extensions even finer control over the
    resulting HTML code.
+ * Added new 'ArticleShowPatrolFooter' hook, which allows extensions to determine
+   if the [mark as patrolled] link should be shown at the footer of patrollable
+   pages.
  
  === External library changes in 1.32 ===
  * …
@@@ -181,11 -184,6 +184,11 @@@ because of Phabricator reports
    CapsuleMultiselectWidget. The following methods may no longer be used:
    * setItemsFromData: Use setValue instead
    * getItemsData: Use getItems instead and get the data property
 +* The hook 'LogEventsListGetExtraInputs' now needs a form descriptor array
 +  and not plain HTML.
 +* LanguageCode::bcp47() now always returns a valid BCP 47 code.  This means
 +  that some MediaWiki-specific language codes, such as `simple`, are mapped
 +  into valid BCP 47 codes (eg `en-simple`).
  
  === Deprecations in 1.32 ===
  * Use of a StartProfiler.php file is deprecated in favour of placing
@@@ -232,12 -230,6 +235,12 @@@
    it had unexpected behavior (only marking text if it looked like a URL)
    and was only used in a single place in the code.  Use
    LanguageConverter::markNoConversion() instead.
 +* (T197492) Language::truncate() was soft deprecated in 1.31 and is
 +  hard deprecated in this release.  It has been split into two similar
 +  methods, Language::truncateForVisual() and Language::truncateForDatabase(),
 +  which measure length in characters and bytes, respectively.  Use
 +  Language::truncateForVisual() when possible to provide equity to users
 +  of multibyte scripts.
  * (T176526) EditPage::getContextTitle() falling back to $wgTitle when the
    context title is unset is now deprecated; anything creating an EditPage
    instance should set the context title via ::setContextTitle().
@@@ -245,22 -237,8 +248,22 @@@
  * ResourceLoaderStartUpModule::getStartupModules() and ::getLegacyModules()
    are deprecated. These concepts are obsolete and have no replacement.
  * String type for $lang of DifferenceEngine::setTextLanguage is deprecated.
 +* The following methods of OutputPage are now deprecated in favour
 +  of using showFatalError directly: OutputPage::showFileDeleteError()
 +  OutputPage::showFileNotFoundError(), OutputPage::showFileRenameError()
 +  OutputPage::showFileCopyError() and OutputPage::showUnexpectedValueError().
 +* The Replacer, DoubleReplacer, HashtableReplacer, and RegexlikeReplacer
 +  classes are now deprecated. Use a Closure instead.
 +* (T194263) ContentHandler::makeParserOptions() is deprecated. Use
 +  WikiPage::makeParserOptions() or ParserOptions::newCanonical() instead.
 +* (T100681) Use of the Parsoid v1 API with the VirtualRESTService, deprecated in
 +  MediaWiki 1.26,  is now hard-deprecated. All known clients were converted to
 +  the Parsoid v3 API in May 2015.
  
  === Other changes in 1.32 ===
 +* (T198811) The following tables have had their UNIQUE indexes turned into
 +  proper PRIMARY KEYs for increased maintainability: interwiki, page_props,
 +  protected_titles and site_identifiers.
  * …
  
  == Compatibility ==

diff --combined docs/hooks.txt
index ff46503,b38b086..5f39aa9
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -739,6 -739,11 +739,11 @@@ $user: the user who did the rollbac
  $revision: the revision the page was reverted back to
  $current: the reverted revision
  
+ 'ArticleShowPatrolFooter': Called at the beginning of Article#showPatrolFooter.
+ Extensions can use this to not show the [mark as patrolled] link in certain
+ circumstances.
+ $article: the Article object
+ 
  'ArticleUndelete': When one or more revisions of an article are restored.
  &$title: Title corresponding to the article restored
  $create: Whether or not the restoration caused the page to be created (i.e. it
@@@ -2182,7 -2187,7 +2187,7 @@@ $autocreated: Boolean, whether this wa
  Special:Log for a specific log type
  $type: String of log type being displayed
  $logEventsList: LogEventsList object for context and access to the WebRequest
 -&$input: string HTML of an input element
 +&$formDescriptor: array HTMLForm's form descriptor
  
  'LogEventsListShowLogExtract': Called before the string is added to OutputPage.
  Returning false will prevent the string from being added to the OutputPage.