| Index: trunk/phase3/skins/common/images/Public-domain.png |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/png |
| Property changes on: trunk/phase3/skins/common/images/Public-domain.png |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 1 | 1 | + image/png |
| Index: trunk/phase3/CREDITS |
| — | — | @@ -57,6 +57,7 @@ |
| 58 | 58 | * Mike Horvath |
| 59 | 59 | * Mormegil |
| 60 | 60 | * Nathaniel Herman |
| | 61 | +* Nathan Larson |
| 61 | 62 | * RememberTheDot |
| 62 | 63 | * ST47 |
| 63 | 64 | |
| Index: trunk/phase3/config/index.php |
| — | — | @@ -691,6 +691,11 @@ |
| 692 | 692 | $conf->RightsIcon = '${wgScriptPath}/skins/common/images/gnu-fdl.png'; |
| 693 | 693 | } elseif( $conf->License == "none" ) { |
| 694 | 694 | $conf->RightsUrl = $conf->RightsText = $conf->RightsCode = $conf->RightsIcon = ""; |
| | 695 | +} elseif( $conf->License == "pd" ) { |
| | 696 | + $conf->RightsUrl = "http://en.wikipedia.org/wiki/Public_domain"; |
| | 697 | + $conf->RightsText = "Public Domain"; |
| | 698 | + $conf->RightsCode = "pd"; |
| | 699 | + $conf->RightsIcon = '${wgScriptPath}/skins/common/images/public-domain.png'; |
| 695 | 700 | } else { |
| 696 | 701 | $conf->RightsUrl = importRequest( "RightsUrl", "" ); |
| 697 | 702 | $conf->RightsText = importRequest( "RightsText", "" ); |
| — | — | @@ -1180,6 +1185,7 @@ |
| 1181 | 1186 | |
| 1182 | 1187 | <ul class="plain"> |
| 1183 | 1188 | <li><?php aField( $conf, "License", "No license metadata", "radio", "none" ); ?></li> |
| | 1189 | + <li><?php aField( $conf, "License", "Public Domain", "radio", "pd" ); ?></li> |
| 1184 | 1190 | <li><?php aField( $conf, "License", "GNU Free Documentation License 1.2 (Wikipedia-compatible)", "radio", "gfdl" ); ?></li> |
| 1185 | 1191 | <li><?php |
| 1186 | 1192 | aField( $conf, "License", "A Creative Commons license - ", "radio", "cc" ); |
| — | — | @@ -1588,7 +1594,7 @@ |
| 1589 | 1595 | |
| 1590 | 1596 | # Add slashes to strings for double quoting |
| 1591 | 1597 | $slconf = array_map( "escapePhpString", get_object_vars( $conf ) ); |
| 1592 | | - if( $conf->License == 'gfdl' ) { |
| | 1598 | + if( $conf->License == 'gfdl' || $conf->License == 'pd' ) { |
| 1593 | 1599 | # Needs literal string interpolation for the current style path |
| 1594 | 1600 | $slconf['RightsIcon'] = $conf->RightsIcon; |
| 1595 | 1601 | } |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -186,7 +186,7 @@ |
| 187 | 187 | * (bug 15820) Special:BlockIP shows a notice if the user being blocked is already |
| 188 | 188 | directly blocked |
| 189 | 189 | * (bug 13710) Allow to force "watch this" checkbox via URL using para "watchthis" |
| 190 | | - |
| | 190 | +* (bug 15125) Add Public Domain to default options when installing. Patch by Nathan Larson. |
| 191 | 191 | === Bug fixes in 1.14 === |
| 192 | 192 | |
| 193 | 193 | * (bug 14907) DatabasePostgres::fieldType now defined. |
