| Index: trunk/extensions/Collection/Collection.php |
| — | — | @@ -82,10 +82,10 @@ |
| 83 | 83 | $wgCollectionMaxArticles = 500; |
| 84 | 84 | |
| 85 | 85 | /** Name of license */ |
| 86 | | -$wgLicenseName = null; |
| | 86 | +$wgCollectionLicenseName = null; |
| 87 | 87 | |
| 88 | 88 | /** HTTP(s) URL pointing to license in wikitext format: */ |
| 89 | | -$wgLicenseURL = null; |
| | 89 | +$wgCollectionLicenseURL = null; |
| 90 | 90 | |
| 91 | 91 | /** List of available download formats, |
| 92 | 92 | as mapping of mwlib writer to format name */ |
| Index: trunk/extensions/Collection/README.txt |
| — | — | @@ -160,24 +160,24 @@ |
| 161 | 161 | |
| 162 | 162 | Default is 500. |
| 163 | 163 | |
| 164 | | - *$wgLicenseName (string or null)* |
| | 164 | + *$wgCollectionLicenseName (string or null)* |
| 165 | 165 | License name for articles in this MediaWiki. |
| 166 | 166 | If set to ``null`` the localized version of the word "License" is used. |
| 167 | 167 | |
| 168 | 168 | Default is null. |
| 169 | 169 | |
| 170 | | - *$wgLicenseURL (string or null)* |
| | 170 | + *$wgCollectionLicenseURL (string or null)* |
| 171 | 171 | HTTP URL of an article containing the full license text in wikitext format |
| 172 | 172 | for articles in this MediaWiki. E.g. |
| 173 | 173 | |
| 174 | | - $wgLicenseURL = 'http://en.wikipedia.org/w/index.php?title=Wikipedia:Text_of_the_GNU_Free_Documentation_License&action=raw'; |
| | 174 | + $wgCollectionLicenseURL = 'http://en.wikipedia.org/w/index.php?title=Wikipedia:Text_of_the_GNU_Free_Documentation_License&action=raw'; |
| 175 | 175 | |
| 176 | 176 | for the GFDL. |
| 177 | 177 | If set to null, the standard MediaWiki variables $wgRightsPage, |
| 178 | 178 | $wgRightsUrl and $wgRightsText are used for license information. |
| 179 | 179 | |
| 180 | 180 | If your MediaWiki contains articles with different licenses, make sure |
| 181 | | - that each article contains the name of the license and set $wgLicenseURL |
| | 181 | + that each article contains the name of the license and set $wgCollectionLicenseURL |
| 182 | 182 | to an article that contains all needed licenses. |
| 183 | 183 | |
| 184 | 184 | * This step is needed for MediaWiki version < 1.14 (at the time of writing |
| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -595,8 +595,8 @@ |
| 596 | 596 | } |
| 597 | 597 | |
| 598 | 598 | function getLicenseInfos() { |
| 599 | | - global $wgLicenseName; |
| 600 | | - global $wgLicenseURL; |
| | 599 | + global $wgCollectionLicenseName; |
| | 600 | + global $wgCollectionLicenseURL; |
| 601 | 601 | global $wgRightsIcon; |
| 602 | 602 | global $wgRightsPage; |
| 603 | 603 | global $wgRightsText; |
| — | — | @@ -614,14 +614,14 @@ |
| 615 | 615 | return array( $licenseInfo ); |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | | - if ( $wgLicenseName ) { |
| 619 | | - $licenseInfo['name'] = $wgLicenseName; |
| | 618 | + if ( $wgCollectionLicenseName ) { |
| | 619 | + $licenseInfo['name'] = $wgCollectionLicenseName; |
| 620 | 620 | } else { |
| 621 | 621 | $licenseInfo['name'] = wfMsgForContent( 'coll-license' ); |
| 622 | 622 | } |
| 623 | 623 | |
| 624 | | - if ( $wgLicenseURL ) { |
| 625 | | - $licenseInfo['mw_license_url'] = $wgLicenseURL; |
| | 624 | + if ( $wgCollectionLicenseURL ) { |
| | 625 | + $licenseInfo['mw_license_url'] = $wgCollectionLicenseURL; |
| 626 | 626 | } else { |
| 627 | 627 | $licenseInfo['mw_rights_icon'] = $wgRightsIcon; |
| 628 | 628 | $licenseInfo['mw_rights_page'] = $wgRightsPage; |