From 7716feb8bf103237626dbbf55355be53b2f99b04 Mon Sep 17 00:00:00 2001 From: Gregor Harlan Date: Thu, 14 Jun 2018 13:01:35 +0200 Subject: [PATCH] rex_delete_cache: rex_config nicht neu laden (#1827) stattdessen nur im Backup-Addon direkt neu laden --- redaxo/src/addons/backup/lib/backup.php | 3 +++ redaxo/src/core/functions/function_rex_other.php | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/redaxo/src/addons/backup/lib/backup.php b/redaxo/src/addons/backup/lib/backup.php index 4255e65a5a..d70761f997 100644 --- a/redaxo/src/addons/backup/lib/backup.php +++ b/redaxo/src/addons/backup/lib/backup.php @@ -215,6 +215,9 @@ public static function importDb($filename) // delete cache before EP to avoid obsolete caches while running extensions rex_delete_cache(); + // refresh rex_config with new values from database + rex_config::refresh(); + // ----- EXTENSION POINT $msg = rex_extension::registerPoint(new rex_extension_point('BACKUP_AFTER_DB_IMPORT', $msg, [ 'content' => $conts, diff --git a/redaxo/src/core/functions/function_rex_other.php b/redaxo/src/core/functions/function_rex_other.php index 088164a710..a5c754fc10 100644 --- a/redaxo/src/core/functions/function_rex_other.php +++ b/redaxo/src/core/functions/function_rex_other.php @@ -25,10 +25,6 @@ function rex_delete_cache() rex_clang::reset(); - if (!rex::isSetup()) { - rex_config::refresh(); - } - // ----- EXTENSION POINT return rex_extension::registerPoint(new rex_extension_point('CACHE_DELETED', rex_i18n::msg('delete_cache_message'))); }