| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -1727,7 +1727,6 @@ |
| 1728 | 1728 | } |
| 1729 | 1729 | } |
| 1730 | 1730 | } elseif ( $option == 'nocopyright' ) { |
| 1731 | | - $footericons = $this->data['footericons']; |
| 1732 | 1731 | unset( $footericons['copyright']['copyright'] ); |
| 1733 | 1732 | if ( count( $footericons['copyright'] ) <= 0 ) { |
| 1734 | 1733 | unset( $footericons['copyright'] ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -2329,11 +2329,13 @@ |
| 2330 | 2330 | * $wgFooterIcons itself is a key/value array. |
| 2331 | 2331 | * The key is the name of a block that the icons will be wrapped in. The final id varies |
| 2332 | 2332 | * by skin; Monobook and Vector will turn poweredby into f-poweredbyico while Modern |
| 2333 | | - * turns it into mw_poweredby. The value is a key/value array of icons. The key may or |
| 2334 | | - * may not be used by the skin but it can be used to find the icon and unset it or |
| 2335 | | - * change the icon if needed. This is useful for disabling icons that are set by extensions. |
| | 2333 | + * turns it into mw_poweredby. |
| | 2334 | + * The value is either key/value array of icons or a string. |
| | 2335 | + * In the key/value array the key may or may not be used by the skin but it can |
| | 2336 | + * be used to find the icon and unset it or change the icon if needed. |
| | 2337 | + * This is useful for disabling icons that are set by extensions. |
| 2336 | 2338 | * The value should be either a string or an array. If it is a string it will be output |
| 2337 | | - * directly, however some skins may choose to ignore it. An array is the preferred format |
| | 2339 | + * directly as html, however some skins may choose to ignore it. An array is the preferred format |
| 2338 | 2340 | * for the icon, the following keys are used: |
| 2339 | 2341 | * src: An absolute url to the image to use for the icon, this is recommended |
| 2340 | 2342 | * but not required, however some skins will ignore icons without an image |
| — | — | @@ -4352,7 +4354,10 @@ |
| 4353 | 4355 | */ |
| 4354 | 4356 | $wgLicenseTerms = false; |
| 4355 | 4357 | |
| 4356 | | -/** Set this to some HTML to override the rights icon with an arbitrary logo */ |
| | 4358 | +/** |
| | 4359 | + * Set this to some HTML to override the rights icon with an arbitrary logo |
| | 4360 | + * @deprecated Use $wgFooterIcons['copyright']['copyright'] |
| | 4361 | + */ |
| 4357 | 4362 | $wgCopyrightIcon = null; |
| 4358 | 4363 | |
| 4359 | 4364 | /** Set this to true if you want detailed copyright information forms on Upload. */ |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1698,7 +1698,7 @@ |
| 1699 | 1699 | if ( is_string( $icon ) ) { |
| 1700 | 1700 | $html = $icon; |
| 1701 | 1701 | } else { // Assuming array |
| 1702 | | - $url = $icon["url"]; |
| | 1702 | + $url = isset($icon["url"]) ? $icon["url"] : null; |
| 1703 | 1703 | unset( $icon["url"] ); |
| 1704 | 1704 | if ( isset( $icon["src"] ) && $withImage === 'withImage' ) { |
| 1705 | 1705 | $html = Html::element( 'img', $icon ); // do this the lazy way, just pass icon data as an attribute array |