From 93479e75b477297003440424e0bbefe63b2b28fe Mon Sep 17 00:00:00 2001 From: addshore Date: Wed, 30 Sep 2026 23:13:38 +0100 Subject: [PATCH 1/2] Fix missing wiki logos in Vector 2022 Expose the existing logo as both wgLogos['1x'] and wgLogos['icon'], including the default Wikibase Cloud logo fallback. This lets Vector 2022 display existing PNG uploads without changing the upload pipeline. Add a CI check for the default logo and document the mapping. I'm aware the phab task includes more requests as part of it, however this is likely the smallest single deployable thing in the right direction. Bug: T356389 --- .github/workflows/mediawiki.verify.yml | 4 ++++ dist-persist/wbstack/src/Settings/LocalSettings.php | 1 + dist/wbstack/src/Settings/LocalSettings.php | 1 + 3 files changed, 6 insertions(+) diff --git a/.github/workflows/mediawiki.verify.yml b/.github/workflows/mediawiki.verify.yml index bfab4a16dd..2ebc95dca4 100644 --- a/.github/workflows/mediawiki.verify.yml +++ b/.github/workflows/mediawiki.verify.yml @@ -24,6 +24,10 @@ jobs: command: docker compose logs mysql | grep "ready for connections" | wc -l | grep 2 - run: curl -L -s -N "http://site1.localhost:8001/wiki/Main_Page" | grep -q "Main Page" + - name: Check Vector 2022 uses the default logo + run: | + curl --fail --silent --show-error "http://site1.localhost:8001/wiki/Main_Page?useskin=vector-2022" | + grep 'class="mw-logo-icon" src="/w/resources/assets/wikibase_cloud.svg"' > /dev/null - run: curl -L -s -N "http://site1.localhost:8001/w/api.php" | grep -q "Main module" - run: curl -L -s -N "http://site1.localhost:8001/w/load.php" | grep -q "no modules were requested" - run: curl -L -s -N "http://site1.localhost:8001/w/rest.php" | grep -q "did not match any known handler" diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php index ee439028e9..66a6b393eb 100644 --- a/dist-persist/wbstack/src/Settings/LocalSettings.php +++ b/dist-persist/wbstack/src/Settings/LocalSettings.php @@ -187,6 +187,7 @@ "1x" => "/w/resources/assets/wikibase_cloud.svg", ]; } +$wgLogos["icon"] = $wgLogos["1x"]; // Favicon $wgFavicon = $wikiInfo->getSetting('wgFavicon'); diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php index ee439028e9..66a6b393eb 100644 --- a/dist/wbstack/src/Settings/LocalSettings.php +++ b/dist/wbstack/src/Settings/LocalSettings.php @@ -187,6 +187,7 @@ "1x" => "/w/resources/assets/wikibase_cloud.svg", ]; } +$wgLogos["icon"] = $wgLogos["1x"]; // Favicon $wgFavicon = $wikiInfo->getSetting('wgFavicon'); From 6e6aebb3e1e28dfec40cd988a21b9626db976bb4 Mon Sep 17 00:00:00 2001 From: addshore Date: Thu, 1 Oct 2026 00:14:48 +0100 Subject: [PATCH 2/2] Check the default logo on a built-in special page The CI schema contains no saved Main Page, so its 404 makes curl --fail reject an otherwise valid logo response. Use Special:Version instead, keeping the HTTP success check and the exact logo assertion. --- .github/workflows/mediawiki.verify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mediawiki.verify.yml b/.github/workflows/mediawiki.verify.yml index 2ebc95dca4..84e59162d2 100644 --- a/.github/workflows/mediawiki.verify.yml +++ b/.github/workflows/mediawiki.verify.yml @@ -26,7 +26,7 @@ jobs: - run: curl -L -s -N "http://site1.localhost:8001/wiki/Main_Page" | grep -q "Main Page" - name: Check Vector 2022 uses the default logo run: | - curl --fail --silent --show-error "http://site1.localhost:8001/wiki/Main_Page?useskin=vector-2022" | + curl --fail --silent --show-error "http://site1.localhost:8001/wiki/Special:Version?useskin=vector-2022" | grep 'class="mw-logo-icon" src="/w/resources/assets/wikibase_cloud.svg"' > /dev/null - run: curl -L -s -N "http://site1.localhost:8001/w/api.php" | grep -q "Main module" - run: curl -L -s -N "http://site1.localhost:8001/w/load.php" | grep -q "no modules were requested"