jenkins-bot has submitted this change and it was merged.

Change subject: Update favico URL refs to point to /static/favicon/..
......................................................................


Update favico URL refs to point to /static/favicon/..

Follows I81489328.

Change-Id: Ib5eaa98a135bf9f1a30be8104f093766b1691c9b
---
M wmf-config/InitialiseSettings.php
M wmf-config/filebackend.php
2 files changed, 50 insertions(+), 50 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index a6b2dd7..5f60801 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10575,59 +10575,59 @@
 # wgFavicon @{
 'wgFavicon' => array(
        # Projects
-       'default' => '//bits.wikimedia.org/favicon/wmf.ico', // Bug T50479
-       'wiki' => '//bits.wikimedia.org/favicon/wikipedia.ico', // Bug T50479
-       'wikibooks' => '//bits.wikimedia.org/favicon/wikibooks.ico',
-       'wikimania' => '//bits.wikimedia.org/favicon/wikimania.ico',
-       'wikinews' => '//bits.wikimedia.org/favicon/wikinews.ico',
-       'wikiquote' => '//bits.wikimedia.org/favicon/wikiquote.ico',
-       'wikisource' => '//bits.wikimedia.org/favicon/wikisource.ico',
-       'wikiversity' => '//bits.wikimedia.org/favicon/wikiversity.ico',
-       'wikivoyage' => '//bits.wikimedia.org/favicon/wikivoyage.ico',
-       'wiktionary' => '//bits.wikimedia.org/favicon/piece.ico',
+       'default' => '/static/favicon/wmf.ico', // Bug T50479
+       'wiki' => '/static/favicon/wikipedia.ico', // Bug T50479
+       'wikibooks' => '/static/favicon/wikibooks.ico',
+       'wikimania' => '/static/favicon/wikimania.ico',
+       'wikinews' => '/static/favicon/wikinews.ico',
+       'wikiquote' => '/static/favicon/wikiquote.ico',
+       'wikisource' => '/static/favicon/wikisource.ico',
+       'wikiversity' => '/static/favicon/wikiversity.ico',
+       'wikivoyage' => '/static/favicon/wikivoyage.ico',
+       'wiktionary' => '/static/favicon/piece.ico',
 
        # Wiktionaries
-       'angwiktionary' => '//bits.wikimedia.org/favicon/wiktionary/en.ico', // 
Bug T59496
-       'cswiktionary' => '//bits.wikimedia.org/favicon/wiktionary/en.ico', // 
Bug T47113
-       'enwiktionary' => '//bits.wikimedia.org/favicon/wiktionary/en.ico', // 
Bug T46843
-       'iswiktionary' => '//bits.wikimedia.org/favicon/wiktionary/en.ico', // 
Bug T48712
-       'siwiktionary' => '//bits.wikimedia.org/favicon/wiktionary/si.ico', // 
Bug T40036
+       'angwiktionary' => '/static/favicon/wiktionary/en.ico', // Bug T59496
+       'cswiktionary' => '/static/favicon/wiktionary/en.ico', // Bug T47113
+       'enwiktionary' => '/static/favicon/wiktionary/en.ico', // Bug T46843
+       'iswiktionary' => '/static/favicon/wiktionary/en.ico', // Bug T48712
+       'siwiktionary' => '/static/favicon/wiktionary/si.ico', // Bug T40036
 
        # Special wikis
-       'advisorywiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'chapcomwiki' => '//bits.wikimedia.org/favicon/chapcom.ico',
-       'checkuserwiki' => '//bits.wikimedia.org/favicon/community.ico',
-       'commonswiki' => '//bits.wikimedia.org/favicon/commons.ico',
-       'donatewiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'fdcwiki' => '//bits.wikimedia.org/favicon/wmf.ico', // Bug T50404
-       'foundationwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'grantswiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'iegcomwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'incubatorwiki' => '//bits.wikimedia.org/favicon/incubator.ico',
-       'internalwiki' => '//bits.wikimedia.org/favicon/internal.ico',
-       'labswiki' => '//bits.wikimedia.org/favicon/wikitech.ico',
-       'legalteamwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'loginwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'mediawikiwiki' => '//bits.wikimedia.org/favicon/mediawiki.ico',
-       'metawiki' => '//bits.wikimedia.org/favicon/community.ico',
-       'officewiki' => '//bits.wikimedia.org/favicon/office.ico',
-       'ombudsmenwiki' => '//bits.wikimedia.org/favicon/wmf.ico', // Bug T50404
-       'otrs_wikiwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'outreachwiki' => '//bits.wikimedia.org/favicon/community.ico',
-       'searchcomwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'sourceswiki' => '//bits.wikimedia.org/favicon/wikisource.ico',
-       'spcomwiki' => '//bits.wikimedia.org/favicon/spcom.ico',
-       'specieswiki' => '//bits.wikimedia.org/favicon/wikispecies.ico',
-       'stewardwiki' => '//bits.wikimedia.org/favicon/community.ico',
-       'strategywiki' => '//bits.wikimedia.org/favicon/community.ico',
-       'testwiki' => '//bits.wikimedia.org/favicon/black-globe.ico',
-       'testwikidatawiki' => '//bits.wikimedia.org/favicon/testwikidata.ico',
-       'transitionteamwiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'usabilitywiki' => '//bits.wikimedia.org/favicon/usability.ico',
-       'votewiki' => '//bits.wikimedia.org/favicon/wmf.ico',
-       'wikidatawiki' => '//bits.wikimedia.org/favicon/wikidata.ico',
-       'wikimaniateamwiki' => '//bits.wikimedia.org/favicon/wikimania.ico',
-       'zerowiki' => '//bits.wikimedia.org/favicon/wmf.ico',
+       'advisorywiki' => '/static/favicon/wmf.ico',
+       'chapcomwiki' => '/static/favicon/chapcom.ico',
+       'checkuserwiki' => '/static/favicon/community.ico',
+       'commonswiki' => '/static/favicon/commons.ico',
+       'donatewiki' => '/static/favicon/wmf.ico',
+       'fdcwiki' => '/static/favicon/wmf.ico', // Bug T50404
+       'foundationwiki' => '/static/favicon/wmf.ico',
+       'grantswiki' => '/static/favicon/wmf.ico',
+       'iegcomwiki' => '/static/favicon/wmf.ico',
+       'incubatorwiki' => '/static/favicon/incubator.ico',
+       'internalwiki' => '/static/favicon/internal.ico',
+       'labswiki' => '/static/favicon/wikitech.ico',
+       'legalteamwiki' => '/static/favicon/wmf.ico',
+       'loginwiki' => '/static/favicon/wmf.ico',
+       'mediawikiwiki' => '/static/favicon/mediawiki.ico',
+       'metawiki' => '/static/favicon/community.ico',
+       'officewiki' => '/static/favicon/office.ico',
+       'ombudsmenwiki' => '/static/favicon/wmf.ico', // Bug T50404
+       'otrs_wikiwiki' => '/static/favicon/wmf.ico',
+       'outreachwiki' => '/static/favicon/community.ico',
+       'searchcomwiki' => '/static/favicon/wmf.ico',
+       'sourceswiki' => '/static/favicon/wikisource.ico',
+       'spcomwiki' => '/static/favicon/spcom.ico',
+       'specieswiki' => '/static/favicon/wikispecies.ico',
+       'stewardwiki' => '/static/favicon/community.ico',
+       'strategywiki' => '/static/favicon/community.ico',
+       'testwiki' => '/static/favicon/black-globe.ico',
+       'testwikidatawiki' => '/static/favicon/testwikidata.ico',
+       'transitionteamwiki' => '/static/favicon/wmf.ico',
+       'usabilitywiki' => '/static/favicon/usability.ico',
+       'votewiki' => '/static/favicon/wmf.ico',
+       'wikidatawiki' => '/static/favicon/wikidata.ico',
+       'wikimaniateamwiki' => '/static/favicon/wikimania.ico',
+       'zerowiki' => '/static/favicon/wmf.ico',
 ),
 # @} end of wgFavicon
 
diff --git a/wmf-config/filebackend.php b/wmf-config/filebackend.php
index 6d95c65..358df69 100644
--- a/wmf-config/filebackend.php
+++ b/wmf-config/filebackend.php
@@ -156,7 +156,7 @@
                'hasSharedCache'   => true,
                'descBaseUrl'      => "//commons.wikimedia.org/wiki/File:",
                'scriptDirUrl'     => "//commons.wikimedia.org/w",
-               'favicon'          => 
"//bits.wikimedia.org/favicon/commons.ico",
+               'favicon'          => "/static/favicon/commons.ico",
                'fetchDescription' => true,
                'wiki'             => 'commonswiki',
                'initialCapital'   => true,

-- 
To view, visit https://gerrit.wikimedia.org/r/208292
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5eaa98a135bf9f1a30be8104f093766b1691c9b
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to