Merge "Remove unused $wgLicenseTerms"

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 3a91223..8408511 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -51,6 +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.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9a85dd4..871319c 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -5846,11 +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']