Lekshmi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113950
Change subject: Merge "Add ParserOutput::addJsConfigVars"
......................................................................
Merge "Add ParserOutput::addJsConfigVars"
Change-Id: Iaeaa10af576ee63949e333c113aa055dc2388604
---
M RELEASE-NOTES-1.23
M includes/Skin.php
2 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/113950/1
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 8347e71..e4a9c93 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -36,6 +36,7 @@
belongs in LocalSettings.php.
* $wgSkipSkin, which has been replaceable by $wgSkipSkins since 2005 (r9249),
is
now formally deprecated.
+* Deprecated $wgCopyrightIcon was removed.
=== New features in 1.23 ===
* ResourceLoader can utilize the Web Storage API to cache modules client-side.
diff --git a/includes/Skin.php b/includes/Skin.php
index 6722cca..c9d3d97 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -833,12 +833,12 @@
* @return null|string
*/
function getCopyrightIcon() {
- global $wgRightsUrl, $wgRightsText, $wgRightsIcon,
$wgCopyrightIcon;
+ global $wgRightsUrl, $wgRightsText, $wgRightsIcon,
$wgFooterIcons;
$out = '';
- if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
- $out = $wgCopyrightIcon;
+ if ( !empty( $wgFooterIcons['copyright']['copyright'] ) {
+ $out = $wgFooterIcons;
} elseif ( $wgRightsIcon ) {
$icon = htmlspecialchars( $wgRightsIcon );
--
To view, visit https://gerrit.wikimedia.org/r/113950
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaeaa10af576ee63949e333c113aa055dc2388604
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Lekshmi <andnlnb...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
