Merge "Allow fallbacks for $wgReferrerPolicy"

diff --combined RELEASE-NOTES-1.31
index e6b9fce,aa8e5f4..8d43722
--- 1/RELEASE-NOTES-1.31
--- 2/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@@ -19,6 -19,8 +19,8 @@@ production
    maintenance/cleanupUsersWithNoId.php.
  * $wgResourceLoaderMinifierStatementsOnOwnLine and $wgResourceLoaderMinifierMaxLineLength
    were removed (deprecated since 1.27).
+ * (T180921) $wgReferrerPolicy now supports having fallbacks for browsers that are not
+   using the latest version of the Referrer Policy specification.
  
  === New features in 1.31 ===
  * Wikimedia\Rdbms\IDatabase->select() and similar methods now support
@@@ -71,10 -73,6 +73,10 @@@ changes to languages because of Phabric
  * (T180052) Mirandese (mwl) now supports gendered NS_USER/NS_USER_TALK namespaces.
  
  === Other changes in 1.31 ===
 +* Introducing multi-content-revision capability into the storage layer. For details,
 +  see <https://www.mediawiki.org/wiki/Requests_for_comment/Multi-Content_Revisions>.
 +* The Revision class was deprecated in favor of RevisionStore, BlobStore, and
 +  RevisionRecord and its subclasses.
  * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
  * The global function wfBCP47 was renamed to LanguageCode::bcp47.
  * The global function wfBCP47 is now deprecated.
@@@ -127,9 -125,6 +129,9 @@@
  * The Block class will no longer accept usable-but-missing usernames for
    'byText' or ->setBlocker(). Callers should either ensure the blocker exists
    locally or use a new interwiki-format username like "iw>Example".
 +* The RevisionInsertComplete hook is now deprecated, use RevisionRecordInserted instead.
 +  RevisionInsertComplete is still called, but the second and third parameter will always be null.
 +  Hard deprecation is scheduled for 1.32.
  * The following methods that get and set ParserOutput state are deprecated.
    Callers should use the new stateless $options parameter to
    ParserOutput::getText() instead.
@@@ -153,9 -148,6 +155,9 @@@
    * WatchedItem::IGNORE_USER_RIGHTS
    * WatchedItem::CHECK_USER_RIGHTS
    * WatchedItem::DEPRECATED_USAGE_TIMESTAMP
 +* The $statementsOnOwnLine parameter of JavaScriptMinifier::minify was removed.
 +  The corresponding configuration variable ($wgResourceLoaderMinifierStatementsOnOwnLine)
 +  has been deprecated since 1.27 and was removed as well.
  
  == Compatibility ==
  MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for

diff --combined includes/DefaultSettings.php
index fecf322,163e253..8091428
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -316,7 -316,7 +316,7 @@@ $wgAppleTouchIcon = false
  
  /**
   * Value for the referrer policy meta tag.
-  * One of the values defined in the Referrer Policy specification:
+  * One or more of the values defined in the Referrer Policy specification:
   * https://w3c.github.io/webappsec-referrer-policy/
   * ('no-referrer', 'no-referrer-when-downgrade', 'same-origin',
   * 'origin', 'strict-origin', 'origin-when-cross-origin',
@@@ -324,8 -324,12 +324,12 @@@
   * Setting it to false prevents the meta tag from being output
   * (which results in falling back to the Referrer-Policy header,
   * or 'no-referrer-when-downgrade' if that's not set either.)
+  * Setting it to an array (supported since 1.31) will create a meta tag for
+  * each value, in the reverse of the order (meaning that the first array element
+  * will be the default and the others used as fallbacks for browsers which do not
+  * understand it).
   *
-  * @var string|bool
+  * @var array|string|bool
   * @since 1.25
   */
  $wgReferrerPolicy = false;
@@@ -3769,7 -3773,7 +3773,7 @@@ $wgResourceLoaderValidateStaticJS = fal
   * @code
   *   $wgResourceLoaderLESSVars = [
   *     'exampleFontSize'  => '1em',
 - *     'exampleBlue' => '#eee',
 + *     'exampleBlue' => '#36c',
   *   ];
   * @endcode
   * @since 1.22
@@@ -6959,7 -6963,6 +6963,7 @@@ $wgUseTagFilter = true
   * - 'mw-blank': Edit completely blanks the page
   * - 'mw-replace': Edit removes more than 90% of the content
   * - 'mw-rollback': Edit is a rollback, made through the rollback link or rollback API
 + * - 'mw-undo': Edit made through an undo link
   *
   * @var array
   * @since 1.31
@@@ -6971,8 -6974,7 +6975,8 @@@ $wgSoftwareTags = 
        'mw-changed-redirect-target' => true,
        'mw-blank' => true,
        'mw-replace' => true,
 -      'mw-rollback' => true
 +      'mw-rollback' => true,
 +      'mw-undo' => true,
  ];
  
  /**