Merge "Try harder to avoid parser cache pollution"

diff --combined RELEASE-NOTES-1.30
index fc49351,64fe822..fa5c280
--- 1/RELEASE-NOTES-1.30
--- 2/RELEASE-NOTES-1.30
+++ b/RELEASE-NOTES-1.30
@@@ -23,6 -23,10 +23,10 @@@ production
  * $wgExceptionHooks has been removed.
  * $wgShellLocale is now applied for all requests. wfInitShellLocale() is
    deprecated and a no-op, as it is no longer needed.
+ * WikiPage::getParserOutput() will now throw an exception if passed
+   ParserOptions would pollute the parser cache. Callers should use
+   WikiPage::makeParserOptions() to create the ParserOptions object and only
+   change options that affect the parser cache key.
  
  === New features in 1.30 ===
  * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@@ -33,6 -37,8 +37,8 @@@
  * File storage backends that supports headers (eg. Swift) now store an
    X-Content-Dimensions header for originals that contain the media's dimensions
    as page ranges keyed by dimensions.
+ * Added a 'ParserOptionsRegister' hook to allow extensions to register
+   additional parser options.
  
  === Languages updated in 1.30 ===
  
@@@ -60,8 -66,6 +66,8 @@@
    the new 'wrapoutputclass' parameter.
  * When errorformat is not 'bc', abort reasons from action=login will be
    formatted as specified by the error formatter parameters.
 +* action=compare can now handle arbitrary text, deleted revisions, and
 +  returning users and edit comments.
  
  === Action API internal changes in 1.30 ===
  * …