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 e7ee86e88905c9d178846cc860ea2819058d89b1..76142f5e4d85830b1486484d5972fd3e0b9dd0a0 100644 (file)
--- 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 eeb71f9a26d485d82f9aa12b59245215a9a83a16..80d3ab3d7f4c3eddeae1cc894d44346231d09cf0 100644 (file)
--- 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)
                );