From c588e2136223cda9f046c2bfc647aee3a94da274 Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 21 May 2013 01:52:41 +0200
Subject: [PATCH] Fixed setup issues

---
 com.woltlab.wcf/package.xml                 |  3 +-
 wcfsetup/install/files/acp/install.php      | 32 ---------------------
 wcfsetup/install/files/acp/post_install.php | 26 +++++++++++++++++
 3 files changed, 28 insertions(+), 33 deletions(-)
 create mode 100644 wcfsetup/install/files/acp/post_install.php

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 90a5376580..3a78d36850 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -38,7 +38,8 @@
 		<instruction type="userProfileMenu">userProfileMenu.xml</instruction>
 		<instruction type="userMenu">userMenu.xml</instruction>
 		<instruction type="userNotificationEvent">userNotificationEvent.xml</instruction>
-		<instruction type="aclOption">aclOption.xml</instruction> 
+		<instruction type="aclOption">aclOption.xml</instruction>
+		<instruction type="script">acp/post_install.php</instruction> 
 	</instructions>
 	
 	<instructions type="update" fromversion="2.0.0 Alpha 1">
diff --git a/wcfsetup/install/files/acp/install.php b/wcfsetup/install/files/acp/install.php
index 014cc8cad2..1049927ab9 100644
--- a/wcfsetup/install/files/acp/install.php
+++ b/wcfsetup/install/files/acp/install.php
@@ -1,10 +1,6 @@
 <?php
-namespace wcf\acp;
 use wcf\data\language\LanguageEditor;
-use wcf\data\user\UserEditor;
-use wcf\data\user\UserProfileAction;
 use wcf\system\cache\CacheHandler;
-use wcf\system\dashboard\DashboardHandler;
 use wcf\system\session\SessionHandler;
 use wcf\system\template\ACPTemplateEngine;
 use wcf\system\WCF;
@@ -61,15 +57,6 @@ $sql = "UPDATE	wcf".WCF_N."_user_group_option
 $statement = WCF::getDB()->prepareStatement($sql);
 $statement->execute(array(1));
 
-// reset all caches
-CacheHandler::getInstance()->flushAll();
-
-// delete language files
-LanguageEditor::deleteLanguageFiles();
-
-// delete all compiled templates
-ACPTemplateEngine::deleteCompiledTemplates(WCF_DIR.'acp/templates/compiled/');
-
 // get server timezone
 if ($timezone = @date_default_timezone_get()) {
 	if ($timezone != 'Europe/London' && in_array($timezone, DateUtil::getAvailableTimezones())) {
@@ -81,23 +68,4 @@ if ($timezone = @date_default_timezone_get()) {
 	}
 }
 
-// set dashboard default values
-DashboardHandler::setDefaultValues('com.woltlab.wcf.user.DashboardPage', array(
-	// content
-	'com.woltlab.wcf.user.recentActivity' => 1,
-	// sidebar
-	'com.woltlab.wcf.user.registerButton' => 1,
-	'com.woltlab.wcf.user.signedInAs' => 2,
-	'com.woltlab.wcf.user.statsSidebar' => 3
-));
-DashboardHandler::setDefaultValues('com.woltlab.wcf.user.MembersListPage', array(
-	'com.woltlab.wcf.user.newestMembers' => 1,
-	'com.woltlab.wcf.user.mostActiveMembers' => 2
-));
 
-// update administrator user rank and user online marking
-$editor = new UserEditor(WCF::getUser());
-$action = new UserProfileAction(array($editor), 'updateUserRank');
-$action->executeAction();
-$action = new UserProfileAction(array($editor), 'updateUserOnlineMarking');
-$action->executeAction();
diff --git a/wcfsetup/install/files/acp/post_install.php b/wcfsetup/install/files/acp/post_install.php
new file mode 100644
index 0000000000..442713fdd2
--- /dev/null
+++ b/wcfsetup/install/files/acp/post_install.php
@@ -0,0 +1,26 @@
+<?php
+use wcf\data\user\UserEditor;
+use wcf\data\user\UserProfileAction;
+use wcf\system\dashboard\DashboardHandler;
+use wcf\system\WCF;
+
+// set dashboard default values
+DashboardHandler::setDefaultValues('com.woltlab.wcf.user.DashboardPage', array(
+// content
+'com.woltlab.wcf.user.recentActivity' => 1,
+// sidebar
+'com.woltlab.wcf.user.registerButton' => 1,
+'com.woltlab.wcf.user.signedInAs' => 2,
+'com.woltlab.wcf.user.statsSidebar' => 3
+));
+DashboardHandler::setDefaultValues('com.woltlab.wcf.user.MembersListPage', array(
+'com.woltlab.wcf.user.newestMembers' => 1,
+'com.woltlab.wcf.user.mostActiveMembers' => 2
+));
+
+// update administrator user rank and user online marking
+$editor = new UserEditor(WCF::getUser());
+$action = new UserProfileAction(array($editor), 'updateUserRank');
+$action->executeAction();
+$action = new UserProfileAction(array($editor), 'updateUserOnlineMarking');
+$action->executeAction();
-- 
2.20.1