From 16c16ea33a4de8599df2aa9ce3804ae07fcf1f6a Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 28 Oct 2013 15:35:02 +0100
Subject: [PATCH] Properly resetting cache after application domain/path
 changing

---
 .../files/lib/acp/form/ApplicationEditForm.class.php      | 4 ----
 .../lib/data/application/ApplicationAction.class.php      | 8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
index 5a0d7d4d65..f0f0f8714e 100644
--- a/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ApplicationEditForm.class.php
@@ -8,7 +8,6 @@ use wcf\system\application\ApplicationHandler;
 use wcf\form\AbstractForm;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\UserInputException;
-use wcf\system\language\LanguageFactory;
 use wcf\system\Regex;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
@@ -203,9 +202,6 @@ class ApplicationEditForm extends AbstractForm {
 		// re-calculate cookie settings
 		ApplicationHandler::rebuild();
 		
-		// rebuild templates
-		LanguageFactory::getInstance()->deleteLanguageCache();
-		
 		// show success.
 		WCF::getTPL()->assign(array(
 			'success' => true
diff --git a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
index 613f8248c8..a6f6ab0ad6 100644
--- a/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
+++ b/wcfsetup/install/files/lib/data/application/ApplicationAction.class.php
@@ -1,8 +1,10 @@
 <?php
 namespace wcf\data\application;
 use wcf\data\AbstractDatabaseObjectAction;
+use wcf\system\cache\builder\ApplicationCacheBuilder;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
+use wcf\system\language\LanguageFactory;
 use wcf\system\WCF;
 use wcf\util\FileUtil;
 use wcf\util\StringUtil;
@@ -98,6 +100,12 @@ class ApplicationAction extends AbstractDatabaseObjectAction {
 			}
 		}
 		WCF::getDB()->commitTransaction();
+		
+		// rebuild templates
+		LanguageFactory::getInstance()->deleteLanguageCache();
+		
+		// reset application cache
+		ApplicationCacheBuilder::getInstance()->reset();
 	}
 	
 	/**
-- 
2.20.1