Merge "Remove unused $wgLicenseTerms"

diff --combined RELEASE-NOTES-1.23
index 3a91223,1818c7c..8408511
--- 1/RELEASE-NOTES-1.23
--- 2/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@@ -51,6 -51,7 +51,7 @@@ production
  * $wgQueryPages has been removed. Query Pages should be added to by using the
    wgQueryPages hook.
  * $wgHttpOnlyBlacklist has been removed.
+ * $wgLicenseTerms has been removed as it was unused.
  
  === New features in 1.23 ===
  * ResourceLoader can utilize the Web Storage API to cache modules client-side.
@@@ -141,10 -142,6 +142,10 @@@
    when the email address is already confirmed. Also, consistently use
    "confirmed", rather than "authenticated", when messaging whether or not the
    user has confirmed an email address.
 +* (bug 19415) action=render no longer shows section edit links. This affects
 +  behavior of several other features where (bogus) section edit links will
 +  disappear, such as file description pages loaded via $wgUseInstantCommons or
 +  pages transcluded cross-wiki via $wgEnableScaryTranscluding.
  * (bug 56912) Show correct link color on cached result of Special:DeadendPages.
  * Classes TitleListDependency and TitleDependency have been removed, as they
    have been found unused in core and extensions for a long time.
@@@ -227,8 -224,6 +228,8 @@@
  * (bug 42026) Added ucshow={new,!new,top,!top} to list=usercontribs.
    Also added newonly to action=feedcontributions.
  * (bug 42026) Deprecated uctoponly in favor of ucshow=top.
 +* list=search no longer has a "srredirects" parameter. Redirects are now
 +  included in all searches.
  
  === Languages updated in 1.23 ===
  
@@@ -310,8 -305,6 +311,8 @@@ changes to languages because of Bugzill
    us to extend parser tests to accommodate additional input/output
    pairs, such as "!!html/parsoid" (for the output of the Parsoid
    parser, where it differs from the PHP parser).
 +* Special:Search no longer has an "include redirects" option on the advanced
 +  tab. Redirects are now included in all searches.
  
  ==== Removed classes ====
  * FakeMemCachedClient (deprecated in 1.18)

diff --combined includes/DefaultSettings.php
index 9a85dd4,9adf03f..871319c
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -5520,10 -5520,9 +5520,10 @@@ $wgGitBin = '/usr/bin/git'
   * @since 1.20
   */
  $wgGitRepositoryViewers = array(
 -      'https://(?:[a-z0-9_]+@)?gerrit.wikimedia.org/r/(?:p/)?(.*)' => 'https://git.wikimedia.org/commit/%r/%H',
 -      'ssh://(?:[a-z0-9_]+@)?gerrit.wikimedia.org:29418/(.*)'
 -              => 'https://git.wikimedia.org/commit/%r/%H',
 +      'https://(?:[a-z0-9_]+@)?gerrit.wikimedia.org/r/(?:p/)?(.*)' =>
 +              'https://git.wikimedia.org/commit/%r/%H',
 +      'ssh://(?:[a-z0-9_]+@)?gerrit.wikimedia.org:29418/(.*)' =>
 +              'https://git.wikimedia.org/commit/%r/%H',
  );
  
  /** @} */ # End of maintenance }
@@@ -5846,11 -5845,6 +5846,6 @@@ $wgRightsText = null
   */
  $wgRightsIcon = null;
  
- /**
-  * Set to an array of metadata terms. Else they will be loaded based on $wgRightsUrl
-  */
- $wgLicenseTerms = false;
- 
  /**
   * Set this to some HTML to override the rights icon with an arbitrary logo
   * @deprecated since 1.18 Use $wgFooterIcons['copyright']['copyright']