From 4f5ea4fbdedb13477f17e06f7c1915754fcd3d51 Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <gerhard.schlager@discourse.org>
Date: Tue, 9 Feb 2021 16:07:41 +0100
Subject: [PATCH] FIX: Restoring backup could fail due to missing uploads

Clearing theme and emoji cache might require uploaded files.
---
 lib/backup_restore/restorer.rb | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/backup_restore/restorer.rb b/lib/backup_restore/restorer.rb
index bbcc225f51f..32472f9818b 100644
--- a/lib/backup_restore/restorer.rb
+++ b/lib/backup_restore/restorer.rb
@@ -56,13 +56,14 @@ module BackupRestore
       @system.disable_readonly_mode
 
       clear_category_cache
-      clear_emoji_cache
-      clear_theme_cache
       clear_stats
       reload_translations
 
       @uploads_restorer.restore(@tmp_directory)
 
+      clear_emoji_cache
+      clear_theme_cache
+
       after_restore_hook
     rescue Compression::Strategy::ExtractFailed
       log 'ERROR: The uncompressed file is too big. Consider increasing the hidden ' \
@@ -134,6 +135,8 @@ module BackupRestore
     def clear_emoji_cache
       log "Clearing emoji cache..."
       Emoji.clear_cache
+    rescue => ex
+      log "Something went wrong while clearing emoji cache.", ex
     end
 
     def reload_translations
@@ -172,6 +175,8 @@ module BackupRestore
       ThemeField.force_recompilation!
       Theme.expire_site_cache!
       Stylesheet::Manager.cache.clear
+    rescue => ex
+      log "Something went wrong while clearing theme cache.", ex
     end
 
     def clear_stats