Merge "Adds the SidebarBeforeOutput hook"

diff --combined RELEASE-NOTES-1.24
index 913a904,3b7583b..1bf308c
--- 1/RELEASE-NOTES-1.24
--- 2/RELEASE-NOTES-1.24
+++ b/RELEASE-NOTES-1.24
@@@ -9,21 -9,18 +9,23 @@@ MediaWiki 1.24 is an alpha-quality bran
  production.
  
  === Configuration changes in 1.24 ===
 +* The server's canonical hostname is available as $wgServerName, which is
 +  exposed in both mw.config and ApiQuerySiteInfo.
  
  === New features in 1.24 ===
  * Added a new hook, "WhatLinksHereProps", to allow extensions to annotate
    WhatLinksHere entries.
 +* Added a new hook, "ContentGetParserOutput", to customize parser output for
 +  a given content object.
 +* Deprecated the hook "ShowRawCssJs", use "ContentGetParserOutput" instead.
  * HTMLForm's HTMLTextField now supports the 'url' type.
  * HTMLForm fields may now be dynamically hidden based on the values of other
    fields in the form.
  * HTMLForm now supports multiple copies of an input field or set of input
    fields, e.g. the form may request "one or more usernames" without having to
    have the user enter delimited list of names into a text field.
+ * Added a new hook, "SidebarBeforeOutput", to allow to edit the structure of
+   the sidebar just before its display.
  
  === Bug fixes in 1.24 ===
  * (bug 62258) A bug was fixed in File::getUnscaledThumb when a height
@@@ -35,7 -32,6 +37,7 @@@
    which used to collapse some sidebar elements by default.
  * (bug 890) Links in Special:RecentChanges and Special:Watchlist no longer
    follow redirects to their target pages.
 +* Parser now dies early if called recursively, instead of producing subtle bugs.
  
  === Web API changes in 1.24 ===
  * action=parse API now supports prop=modules, which provides the list of
@@@ -62,23 -58,6 +64,23 @@@ changes to languages because of Bugzill
  * CLDRPluralRuleConverter_Operator to CLDRPluralRuleConverterOperator
  * CLDRPluralRuleEvaluator_Range to CLDRPluralRuleEvaluatorRange
  * CSSJanus_Tokenizer to CSSJanusTokenizer
 +* RevDel_ArchiveItem to RevDelArchiveItem
 +* RevDel_ArchiveList to RevDelArchiveList
 +* RevDel_ArchivedFileItem to RevDelArchivedFileItem
 +* RevDel_ArchivedFileList to RevDelArchivedFileList
 +* RevDel_ArchivedRevisionItem to RevDelArchivedRevisionItem
 +* RevDel_FileItem to RevDelFileItem
 +* RevDel_FileList to RevDelFileList
 +* RevDel_Item to RevDelItem
 +* RevDel_List to RevDelList
 +* RevDel_LogItem to RevDelLogItem
 +* RevDel_LogList to RevDelLogList
 +* RevDel_RevisionItem to RevDelRevisionItem
 +* RevDel_RevisionList to RevDelRevisionList
 +
 +==== Removed classes ====
 +* IPBlockForm - Use SpecialBlock directly
 +* WatchlistEditor - Use SpecialEditWatchlist directly
  
  == Compatibility ==
  
@@@ -98,7 -77,7 +100,7 @@@ The supported versions are
  
  == Upgrading ==
  
 -1.24 has several database changes since 1.22, and will not work without schema
 +1.24 has several database changes since 1.23, and will not work without schema
  updates. Note that due to changes to some very large tables like the revision
  table, the schema update may take quite long (minutes on a medium sized site,
  many hours on a large site).
@@@ -118,7 -97,7 +120,7 @@@ Don't forget to always back up your dat
  
  See the file UPGRADE for more detailed upgrade instructions.
  
 -For notes on 1.21.x and older releases, see HISTORY.
 +For notes on 1.22.x and older releases, see HISTORY.
  
  == Online documentation ==
  

diff --combined docs/hooks.txt
index 87eca8d,333f878..d455fd2
--- 1/docs/hooks.txt
--- 2/docs/hooks.txt
+++ b/docs/hooks.txt
@@@ -887,19 -887,6 +887,19 @@@ $title: the Title in question
  Handler functions that modify $ok should generally return false to prevent further
  hooks from further modifying $ok.
  
 +'ContentGetParserOutput': Customize parser output for a given content object,
 +called by AbstractContent::getParserOutput. May be used to override the normal
 +model-specific rendering of page content.
 +$content: The Content to render
 +$title: Title of the page, as context
 +$revId: The revision ID, as context
 +$options: ParserOptions for rendering. To avoid confusing the parser cache,
 +the output can only depend on parameters provided to this hook function, not on global state.
 +$generateHtml: boolean, indicating whether full HTML should be generated. If false,
 +generation of HTML may be skipped, but other information should still be present in the
 +ParserOutput object.
 +&$output: ParserOutput, to manipulate or replace
 +
  'ConvertContent': Called by AbstractContent::convert when a conversion to another
  content model is requested.
  $content: The Content object to be converted.
@@@ -2184,7 -2171,7 +2184,7 @@@ $title : Current Title object being dis
  $article: The article object corresponding to the page
  
  'ShowRawCssJs': Customise the output of raw CSS and JavaScript in page views.
 -DEPRECATED, use the ContentHandler facility to handle CSS and JavaScript!
 +DEPRECATED, use the ContentGetParserOutput hook instead!
  $text: Text being shown
  $title: Title of the custom script/stylesheet page
  $output: Current OutputPage object
@@@ -2239,6 -2226,12 +2239,12 @@@ $skin: Skin objec
  &$bar: Sidebar contents
  Modify $bar to add or modify sidebar portlets.
  
+ 'SidebarBeforeOutput': Allows to edit sidebar just before its output by skins.
+ $skin Skin object
+ &$bar: Sidebar content
+ Modify $bar to add or modify sidebar portlets.
+ Warning: This hook is run on each display. You should consider to use 'SkinBuildSidebar' that is aggressively cached.
+ 
  'SkinCopyrightFooter': Allow for site and per-namespace customization of
  copyright notice.
  $title: displayed page title