Skip to content

chore: repair the settings load order WikvenSiteUrl needs #624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lens0021 merged 1 commit into from
Sep 2, 2026
Merged

chore: repair the settings load order WikvenSiteUrl needs #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/.wikven.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ skins:
- Citizen
- MinervaNeue
config:
# Where this site is served from. Nothing in a build can work this out for itself: it renders
# against a local server and links every page relatively, which is what lets an export run from
# any directory and any host. Anything that has to name a page from outside the site is built
# from this.
WikvenSiteUrl: https://chaotic-ground.github.io/wikven/
WikvenFooterUrl: https://github.com/chaotic-ground/wikven
WikvenEditUrl: https://github.com/chaotic-ground/wikven/edit/main/docs/$1
WikvenHistoryUrl: https://github.com/chaotic-ground/wikven/commits/main/docs/$1
Expand Down
8 changes: 4 additions & 4 deletions includes/WikvenSettings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,11 @@
// Load config: default.yml then the site file via $wgSettings; ext/skin lists loaded leniently.
global $wgSettings;

// Autoloader not active yet at LocalSettings time; load the helper directly.
// Autoloader not active yet at LocalSettings time; load the helpers directly. SiteUrl belongs here
// rather than beside its other use below: lint() reads a site's WikvenSiteUrl through it, and that
// runs a few lines down from here.
require_once "$IP/extensions/Wikven/includes/SiteConfig.php";
require_once "$IP/extensions/Wikven/includes/SiteUrl.php";

// Pick the highest-precedence config name present; warn about any others.
$wikvenLocated = MediaWiki\Extension\Wikven\SiteConfig::locate($wikvenSrc);
Expand Down Expand Up @@ -198,9 +201,6 @@
// Push merged config into globals so the logo handling below reads final values.
$wgSettings->apply();

// Autoloader not active yet at LocalSettings time; load the helper directly.
require_once "$IP/extensions/Wikven/includes/SiteUrl.php";

// Core keeps a site's address in two halves -- $wgCanonicalServer is scheme and host, a path lives
// elsewhere -- and a site should not have to write it twice. It writes WikvenSiteUrl once and this
// hands core the half core understands, so an absolute URL core or any extension builds names the
Expand Down
Loading