(bug 15125) Add Public Domain to default options when installing. Patch by Nathan...

diff --git a/CREDITS b/CREDITS
index 1ff4746..84a25a5 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -57,6 +57,7 @@ following names for their contribution to the product.
 * Mike Horvath
 * Mormegil
 * Nathaniel Herman
+* Nathan Larson
 * RememberTheDot
 * ST47
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 40bb9ab..7ffe694 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -186,7 +186,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 15820) Special:BlockIP shows a notice if the user being blocked is already
   directly blocked
 * (bug 13710) Allow to force "watch this" checkbox via URL using para "watchthis"
-
+* (bug 15125) Add Public Domain to default options when installing. Patch by Nathan Larson.
 === Bug fixes in 1.14 ===
 
 * (bug 14907) DatabasePostgres::fieldType now defined.

diff --git a/config/index.php b/config/index.php
index 5ec86f1..6432e15 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -691,6 +691,11 @@ if( $conf->License == "gfdl" ) {
        $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->RightsText = "Public Domain";
+       $conf->RightsCode = "pd";
+       $conf->RightsIcon = '${wgScriptPath}/skins/common/images/public-domain.png';
 } else {
        $conf->RightsUrl = importRequest( "RightsUrl", "" );
        $conf->RightsText = importRequest( "RightsText", "" );
@@ -1180,6 +1185,7 @@ 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", "A Creative Commons license - ", "radio", "cc" );
@@ -1588,7 +1594,7 @@ function writeLocalSettings( $conf ) {
 
        # Add slashes to strings for double quoting
        $slconf = array_map( "escapePhpString", get_object_vars( $conf ) );
-       if( $conf->License == 'gfdl' ) {
+       if( $conf->License == 'gfdl' || $conf->License == 'pd' ) {
                # Needs literal string interpolation for the current style path
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }

diff --git a/skins/common/images/Public-domain.png b/skins/common/images/Public-domain.png
new file mode 100644 (file)
index 0000000..e5fb33c
Binary files /dev/null and b/skins/common/images/Public-domain.png differ