From: Ryan Kaldari <kaldari@users.mediawiki.org>
Date: Wed, 11 May 2011 00:32:03 +0000 (+0000)
Subject: Updating license choices for installer. CC public domain dedication is deprecated... 
X-Git-Tag: 1.31.0-rc.0~30283
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=95758bfcb4af62c2796842bf0d81ee319614b808;p=lhc%2Fweb%2Fwiklou.git

Updating license choices for installer. CC public domain dedication is deprecated by Creative Commons (replaced by CC0). Since GFDL migration window is over, theres no reason to still offer the old GFDL 1.2. Adding CC-by since this is a commonly used license.
---

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index ade6322889..0d563e20ee 100644
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -391,11 +391,10 @@ More complex user rights configurations are available after installation, see th
 	'config-license'                  => 'Copyright and license:',
 	'config-license-none'             => 'No license footer',
 	'config-license-cc-by-sa'         => 'Creative Commons Attribution Share Alike',
+	'config-license-cc-by'            => 'Creative Commons Attribution',
 	'config-license-cc-by-nc-sa'      => 'Creative Commons Attribution Non-Commercial Share Alike',
-	'config-license-cc-0'             => 'Creative Commons Zero',
-	'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2',
-	'config-license-gfdl-current'     => 'GNU Free Documentation License 1.3 or later',
-	'config-license-pd'               => 'Public Domain',
+	'config-license-cc-0'             => 'Creative Commons Zero (Public Domain)',
+	'config-license-gfdl'             => 'GNU Free Documentation License 1.3 or later',
 	'config-license-cc-choose'        => 'Select a custom Creative Commons license',
 	'config-license-help'             => "Many public wikis put all contributions under a [http://freedomdefined.org/Definition free license].
 This helps to create a sense of community ownership and encourages long-term contribution.
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 8ece8b903e..60fbfa4166 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -239,6 +239,10 @@ abstract class Installer {
 	 * @var array
 	 */
 	public $licenses = array(
+		'cc-by' => array(
+			'url' => 'http://creativecommons.org/licenses/by/3.0/',
+			'icon' => '{$wgStylePath}/common/images/cc-by.png',
+		),
 		'cc-by-sa' => array(
 			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
 			'icon' => '{$wgStylePath}/common/images/cc-by-sa.png',
@@ -251,15 +255,7 @@ abstract class Installer {
 			'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
 			'icon' => '{$wgStylePath}/common/images/cc-0.png',
 		),
-		'pd' => array(
-			'url' => 'http://creativecommons.org/licenses/publicdomain/',
-			'icon' => '{$wgStylePath}/common/images/public-domain.png',
-		),
-		'gfdl-old' => array(
-			'url' => 'http://www.gnu.org/licenses/old-licenses/fdl-1.2.html',
-			'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
-		),
-		'gfdl-current' => array(
+		'gfdl' => array(
 			'url' => 'http://www.gnu.org/copyleft/fdl.html',
 			'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
 		),