From 4252a3333caad75eb001f13a5680f6908b1e5ee4 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 26 Jan 2015 00:47:03 +0100
Subject: [PATCH] Fixed some issues

---
 com.woltlab.wcf/option.xml                                | 6 ++++++
 wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.php | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 8e4c84bff2..6eb2698d87 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -29,15 +29,18 @@
 			</category>
 				<category name="general.page">
 					<parent>general</parent>
+					<showorder>1</showorder>
 				</category>
 					<category name="general.page.seo">
 						<parent>general.page</parent>
 					</category>
 				<category name="general.offline">
 					<parent>general</parent>
+					<showorder>2</showorder>
 				</category>
 				<category name="general.system">
 					<parent>general</parent>
+					<showorder>3</showorder>
 				</category>
 					<category name="general.system.cookie">
 						<parent>general.system</parent>
@@ -68,6 +71,7 @@
 					</category>
 				<category name="general.mail">
 					<parent>general</parent>
+					<showorder>4</showorder>
 				</category>
 					<category name="general.mail.general">
 						<parent>general.mail</parent>
@@ -77,6 +81,7 @@
 					</category>
 				<category name="general.cache">
 					<parent>general</parent>
+					<showorder>5</showorder>
 				</category>
 					<category name="general.cache.general">
 						<parent>general.cache</parent>
@@ -86,6 +91,7 @@
 					</category>
 				<category name="general.payment">
 					<parent>general</parent>
+					<showorder>6</showorder>
 				</category>
 					<category name="general.payment.paidSubscription">
 						<parent>general.payment</parent>
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.php
index 10a4aee12d..9bf180f2e4 100644
--- a/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.php
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_2.1.php
@@ -3,7 +3,7 @@ use wcf\data\option\OptionEditor;
 
 /**
  * @author	Alexander Ebert
- * @copyright	2001-2014 WoltLab GmbH
+ * @copyright	2001-2015 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package	com.woltlab.wcf
  * @category	Community Framework
@@ -25,6 +25,6 @@ if (RECAPTCHA_PUBLICKEY === '6LfOlMYSAAAAADvo3s4puBAYDqI-6YK2ybe7BJE5' && RECAPT
 	$options['recaptcha_privatekey'] = '';
 }
 
-OptionEditor::updateAll($options);
+OptionEditor::import($options);
 
 OptionEditor::resetCache();
-- 
2.20.1