diff --git a/Sources/Maintenance/Tools/Install.php b/Sources/Maintenance/Tools/Install.php index 51c1879883..171fd99fa2 100644 --- a/Sources/Maintenance/Tools/Install.php +++ b/Sources/Maintenance/Tools/Install.php @@ -1131,6 +1131,14 @@ public function finalize(): bool // Reload $modSettings. Config::reloadModSettings(); + // Everything below needs a current user: Time and Logging both read + // User::$me to work out which time zone to record dates in. + if (isset(Maintenance::$context['id_member'])) { + User::setMe((int) Maintenance::$context['id_member']); + } else { + User::loadMe(); + } + // Bring a warning over. if (!empty(Maintenance::$context['account_existed'])) { Maintenance::$warnings = Maintenance::$context['account_existed']; @@ -1247,12 +1255,6 @@ public function finalize(): bool // We've just installed! $_SERVER['BAN_CHECK_IP'] = IP::getUserIPAlternative(); - if (isset(Maintenance::$context['id_member'])) { - User::setMe((int) Maintenance::$context['id_member']); - } else { - User::loadMe(); - } - User::$me->ip = IP::getUserIP(); Logging::logAction('install', ['version' => SMF_FULL_VERSION], 'admin');