From 3b01b602c6a10c26aebcfc6076c3f95b735091f2 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Wed, 28 Jul 2021 17:04:04 +0200 Subject: Migrator: Don't recreate Language object anymore Do not force the recreation of the Language object in the migrations.php file anymore by changing the include position of the migrations.php (and the functions.php) in the application.php file a bit to the top. --- core/application.php | 24 ++++++++++++------------ core/migrations.php | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/core/application.php b/core/application.php index 2f6a277..a907a27 100644 --- a/core/application.php +++ b/core/application.php @@ -114,6 +114,18 @@ foreach([ #=============================================================================== require 'configuration.php'; +#=============================================================================== +# Include functions +#=============================================================================== +require 'functions.php'; + +#=============================================================================== +# Include migration detection +#=============================================================================== +if(Application::get('MIGRATOR.ENABLED')) { + require 'migrations.php'; +} + #=============================================================================== # Override configuration if admin #=============================================================================== @@ -139,24 +151,12 @@ if(defined('ADMINISTRATION') AND ADMINISTRATION === TRUE) { Application::set('TEMPLATE.LANG', Application::get('ADMIN.LANGUAGE')); } -#=============================================================================== -# Include functions -#=============================================================================== -require 'functions.php'; - #=============================================================================== # Get Language and Database singletons #=============================================================================== $Language = Application::getLanguage(); $Database = Application::getDatabase(); -#=============================================================================== -# Include migration detection -#=============================================================================== -if(Application::get('MIGRATOR.ENABLED')) { - require 'migrations.php'; -} - #=============================================================================== # Check if "304 Not Modified" and ETag header should be sent #=============================================================================== diff --git a/core/migrations.php b/core/migrations.php index f2c9714..1ddeefd 100644 --- a/core/migrations.php +++ b/core/migrations.php @@ -12,7 +12,6 @@ if($Migrator->isMigrationNeeded()) { Application::set('TEMPLATE.NAME', Application::get('ADMIN.TEMPLATE')); Application::set('TEMPLATE.LANG', Application::get('ADMIN.LANGUAGE')); - Application::getLanguage(TRUE); // Force recreation of Language object if(HTTP::issetPOST(['token' => Application::getSecurityToken()], 'run')) { if(!$migrated = $Migrator->runMigrations()) { -- cgit v1.2.3