From 5fe42047edd2de8f9158fb41206793936e0897b0 Mon Sep 17 00:00:00 2001 From: X! Date: Sun, 2 Nov 2008 05:32:57 +0000 Subject: [PATCH] (bug 15125) Add Public Domain to default options when installing. Patch by Nathan Larson. --- CREDITS | 1 + RELEASE-NOTES | 2 +- config/index.php | 8 +++++++- skins/common/images/Public-domain.png | Bin 0 -> 2892 bytes 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 skins/common/images/Public-domain.png diff --git a/CREDITS b/CREDITS index 1ff4746262..84a25a5845 100644 --- 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 40bb9abf57..7ffe694330 100644 --- 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 5ec86f15c0..6432e15881 100644 --- 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 ) ) {