| Index: branches/REL1_17/phase3/includes/DefaultSettings.php |
| — | — | @@ -2318,11 +2318,13 @@ |
| 2319 | 2319 | * $wgFooterIcons itself is a key/value array. |
| 2320 | 2320 | * The key is the name of a block that the icons will be wrapped in. The final id varies |
| 2321 | 2321 | * by skin; Monobook and Vector will turn poweredby into f-poweredbyico while Modern |
| 2322 | | - * turns it into mw_poweredby. The value is a key/value array of icons. The key may or |
| 2323 | | - * may not be used by the skin but it can be used to find the icon and unset it or |
| 2324 | | - * change the icon if needed. This is useful for disabling icons that are set by extensions. |
| | 2322 | + * turns it into mw_poweredby. |
| | 2323 | + * The value is either key/value array of icons or a string. |
| | 2324 | + * In the key/value array the key may or may not be used by the skin but it can |
| | 2325 | + * be used to find the icon and unset it or change the icon if needed. |
| | 2326 | + * This is useful for disabling icons that are set by extensions. |
| 2325 | 2327 | * The value should be either a string or an array. If it is a string it will be output |
| 2326 | | - * directly, however some skins may choose to ignore it. An array is the preferred format |
| | 2328 | + * directly as html, however some skins may choose to ignore it. An array is the preferred format |
| 2327 | 2329 | * for the icon, the following keys are used: |
| 2328 | 2330 | * src: An absolute url to the image to use for the icon, this is recommended |
| 2329 | 2331 | * but not required, however some skins will ignore icons without an image |
| — | — | @@ -4334,7 +4336,10 @@ |
| 4335 | 4337 | */ |
| 4336 | 4338 | $wgLicenseTerms = false; |
| 4337 | 4339 | |
| 4338 | | -/** Set this to some HTML to override the rights icon with an arbitrary logo */ |
| | 4340 | +/** |
| | 4341 | + * Set this to some HTML to override the rights icon with an arbitrary logo |
| | 4342 | + * @deprecated Use $wgFooterIcons['copyright']['copyright'] |
| | 4343 | + */ |
| 4339 | 4344 | $wgCopyrightIcon = null; |
| 4340 | 4345 | |
| 4341 | 4346 | /** Set this to true if you want detailed copyright information forms on Upload. */ |
| Index: branches/REL1_17/phase3/includes/Skin.php |
| — | — | @@ -1640,7 +1640,7 @@ |
| 1641 | 1641 | if ( is_string( $icon ) ) { |
| 1642 | 1642 | $html = $icon; |
| 1643 | 1643 | } else { // Assuming array |
| 1644 | | - $url = $icon["url"]; |
| | 1644 | + $url = isset($icon["url"]) ? $icon["url"] : null; |
| 1645 | 1645 | unset( $icon["url"] ); |
| 1646 | 1646 | if ( isset( $icon["src"] ) && $withImage === 'withImage' ) { |
| 1647 | 1647 | $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -99,6 +99,8 @@ |
| 100 | 100 | * (bug 26253) $wgPostCommitUpdateList has been removed |
| 101 | 101 | * The PHPUnit test suite has been removed from this release due to serious issues |
| 102 | 102 | which should be resolved by the 1.18 release |
| | 103 | +* $wgCopyrightIcon is deprecated and $wgFooterIcons['copyright']['copyright'] should |
| | 104 | + be used instead. |
| 103 | 105 | |
| 104 | 106 | === New features in 1.17 === |
| 105 | 107 | * (bug 10183) Users can now add personal styles and scripts to all skins via |