From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 22 Dec 2011 18:39:21 +0000 (+0100)
Subject: Fixed i18n and ACP access
X-Git-Tag: 2.0.0_Beta_1~1483
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c5676c5620965d3a0a7d7b1d36eb97cee9f3038;p=GitHub%2FWoltLab%2FWCF.git

Fixed i18n and ACP access
---

diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index e7ee86e889..76142f5e4d 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -40,7 +40,11 @@ class WCFACP extends WCF {
 		$this->initBlacklist();
 		$this->initAuth();
 		$this->initCoreObjects();
-		$this->initApplications();
+		
+		// prevent application loading during setup
+		if (PACKAGE_ID) {
+			$this->initApplications();
+		}
 	}
 	
 	/**
diff --git a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
index eeb71f9a26..80d3ab3d7f 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php
@@ -31,7 +31,7 @@ class OptionPackageInstallationPlugin extends AbstractOptionPackageInstallationP
 		// default values
 		$optionName = $optionType = $defaultValue = $validationPattern = $selectOptions = $enableOptions = $permissions = $options = '';
 		$showOrder = null;
-		$hidden = $supportI18n = $optionalI18n = 0;
+		$hidden = $supportI18n = $requireI18n = 0;
 		
 		// get values
 		if (isset($option['name'])) $optionName = $option['name'];
@@ -46,7 +46,7 @@ class OptionPackageInstallationPlugin extends AbstractOptionPackageInstallationP
 		if (isset($option['permissions'])) $permissions = $option['permissions'];
 		if (isset($option['options'])) $options = $option['options'];
 		if (isset($option['supporti18n'])) $supportI18n = $option['supporti18n'];
-		if (isset($option['optionali18n'])) $optionalI18n = $option['optionali18n'];
+		if (isset($option['requirei18n'])) $requireI18n = $option['requirei18n'];
 		
 		// check if optionType exists
 		$className = 'wcf\system\option\\'.StringUtil::firstCharToUpperCase($optionType).'OptionType';
@@ -72,7 +72,7 @@ class OptionPackageInstallationPlugin extends AbstractOptionPackageInstallationP
 			'permissions' => $permissions,
 			'options' => $options,
 			'supportI18n' => $supportI18n,
-			'optionalI18n' => $optionalI18n,
+			'requireI18n' => $requireI18n,
 			'additionalData' => serialize($additionalData)
 		);