GFDL 1.3 is out, need to update the installer appropriately.

* GFDL 1.2 now links to 1.2, instead of 1.3
* 1.3 has been added as an option, 1.2 still Wikipedia-compatible
* The rights codes were tweaked a bit (see RELEASE-NOTES)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ede8c74..ec7efce 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -221,6 +221,10 @@ The following extensions are migrated into MediaWiki 1.14:
 * Cascading protection no longer requires that both edit and move are restricted
   to sysop, just edit=sysop is enough
 * (bug 2391) A warning is now shown for invalid ISBN numbers on Special:Booksources.
+* Installer has been updated to reflect the release of the GFDL 1.3. The URL for 1.2
+  has been updated, and the 1.3 URL has been given. 1.2 is still Wikipedia-compatible.
+  RightsCode was changed from 'gfdl' to 'gfdl1_2', so we can now support 1.2 as well
+  as 1.3 (gfdl1_3).
 
 === Bug fixes in 1.14 ===
 

diff --git a/config/index.php b/config/index.php
index 6432e15..2810561 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -684,15 +684,20 @@ if( $conf->SysopName ) {
 }
 
 $conf->License = importRequest( "License", "none" );
-if( $conf->License == "gfdl" ) {
-       $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+if( $conf->License == "gfdl1_2" ) {
+       $conf->RightsUrl = "http://www.gnu.org/licenses/old-licenses/fdl-1.2.txt";
        $conf->RightsText = "GNU Free Documentation License 1.2";
-       $conf->RightsCode = "gfdl";
+       $conf->RightsCode = "gfdl1_2";
+       $conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
+} elseif( $conf->License == "gfdl1_3" ) {
+       $conf->RightsUrl = "http://www.gnu.org/copyleft/fdl.html";
+       $conf->RightsText = "GNU Free Documentation License 1.3";
+       $conf->RightsCode = "gfdl1_3";
        $conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png';
 } elseif( $conf->License == "none" ) {
        $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = "";
 } elseif( $conf->License == "pd" ) {
-       $conf->RightsUrl = "http://en.wikipedia.org/wiki/Public_domain";
+       $conf->RightsUrl = "http://creativecommons.org/licenses/publicdomain/";
        $conf->RightsText = "Public Domain";
        $conf->RightsCode = "pd";
        $conf->RightsIcon = '${wgScriptPath}/skins/common/images/public-domain.png';
@@ -1186,7 +1191,8 @@ if( count( $errs ) ) {
                <ul class="plain">
                <li><?php aField( $conf, "License", "No license metadata", "radio", "none" ); ?></li>
                <li><?php aField( $conf, "License", "Public Domain", "radio", "pd" ); ?></li>
-               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li>
+               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl1_2" ); ?></li>
+               <li><?php aField( $conf, "License", "GNU Free Documentation License 1.3", "radio", "gfdl1_3" ); ?></li>
                <li><?php
                        aField( $conf, "License", "A Creative Commons license - ", "radio", "cc" );
                        $partner = "MediaWiki";
@@ -1594,7 +1600,7 @@ function writeLocalSettings( $conf ) {
 
        # Add slashes to strings for double quoting
        $slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
-       if( $conf->License == 'gfdl' || $conf->License == 'pd' ) {
+       if( $conf->License == 'gfdl1_2' || $conf->License == 'pd' || $conf->License == 'gfdl1_3' ) {
                # Needs literal string interpolation for the current style path
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }