diff options
| author | Thomas Lange <code@nerdmind.de> | 2021-07-28 17:04:04 +0200 |
|---|---|---|
| committer | Thomas Lange <code@nerdmind.de> | 2021-07-28 17:37:04 +0200 |
| commit | 3b01b602c6a10c26aebcfc6076c3f95b735091f2 (patch) | |
| tree | 8eb02a258906970cf3087c352f2f449202a78d9e | |
| parent | 1017a99e81d0445a8614917a1798bbd02d88d14e (diff) | |
| download | blog-3b01b602c6a10c26aebcfc6076c3f95b735091f2.tar.gz blog-3b01b602c6a10c26aebcfc6076c3f95b735091f2.tar.xz blog-3b01b602c6a10c26aebcfc6076c3f95b735091f2.zip | |
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.
| -rw-r--r-- | core/application.php | 24 | ||||
| -rw-r--r-- | 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 @@ -115,6 +115,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 #=============================================================================== if(defined('ADMINISTRATION') AND ADMINISTRATION === TRUE) { @@ -140,24 +152,12 @@ if(defined('ADMINISTRATION') AND ADMINISTRATION === TRUE) { } #=============================================================================== -# 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 #=============================================================================== if(Application::get('CORE.SEND_304') AND !defined('ADMINISTRATION')) { 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()) { |