Foxtrott has submitted this change and it was merged.
Change subject: Remove usage of global
......................................................................
Remove usage of global
Change-Id: Icef8bbcaa1cf7630e4d6efdbc8cc4f8959b4e0b0
---
M src/Components/Logo.php
M tests/phpunit/Util/MockupFactory.php
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/src/Components/Logo.php b/src/Components/Logo.php
index 5bc0e00..1bc3c3b 100644
--- a/src/Components/Logo.php
+++ b/src/Components/Logo.php
@@ -4,7 +4,7 @@
*
* This file is part of the MediaWiki skin Chameleon.
*
- * @copyright 2013 - 2014, Stephan Gambke
+ * @copyright 2013 - 2015, Stephan Gambke
* @license GNU General Public License, version 3 (or any later version)
*
* The Chameleon skin is free software: you can redistribute it and/or modify
@@ -55,7 +55,7 @@
$contents = \Html::element( 'img',
array(
'src' => $this->getSkinTemplate()->data[
'logopath' ],
- 'alt' => $GLOBALS[ 'wgSitename' ]
+ 'alt' => $this->getSkinTemplate()->data[
'sitename' ],
)
);
diff --git a/tests/phpunit/Util/MockupFactory.php
b/tests/phpunit/Util/MockupFactory.php
index e993377..2a5560c 100644
--- a/tests/phpunit/Util/MockupFactory.php
+++ b/tests/phpunit/Util/MockupFactory.php
@@ -2,7 +2,7 @@
/**
* This file is part of the MediaWiki skin Chameleon.
*
- * @copyright 2013 - 2014, Stephan Gambke
+ * @copyright 2013 - 2015, Stephan Gambke
* @license GNU General Public License, version 3 (or any later version)
*
* The Chameleon skin is free software: you can redistribute it and/or modify
@@ -133,6 +133,7 @@
// Required by Logo
'logopath' => 'foo',
+ 'sitename' => 'bar',
// Required by NavMenu
'nav_urls' => array(
--
To view, visit https://gerrit.wikimedia.org/r/232847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icef8bbcaa1cf7630e4d6efdbc8cc4f8959b4e0b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott <[email protected]>
Gerrit-Reviewer: Foxtrott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
