Adjustments because of option type class name changes

diff --git a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
index dea4920e8588436fe2e2c37c1a7a9375ef022c01..2c2ca0f0f9530994b3daab99b025000efb2b9bfb 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php
@@ -112,7 +112,7 @@ abstract class AbstractOptionListForm extends AbstractForm {
         */
        protected function getTypeObject($type) {
                if (!isset($this->typeObjects[$type])) {
-                       $className = 'wcf\system\option\OptionType'.ucfirst($type);
+                       $className = 'wcf\system\option\\'.StringUtil::firstCharToLowerCase($type).'OptionType';
                        
                        // validate class
                        if (!class_exists($className)) {

diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
index 5094c191618a69675f9ecbd4e9e15c0298d375e5..d2f7d5108310132bc3434ffeec8aef9b5c1f9f29 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserGroupAddForm.class.php
@@ -187,7 +187,7 @@ class UserGroupAddForm extends AbstractOptionListForm {
         */
        protected function getTypeObject($type) {
                if (!isset($this->typeObjects[$type])) {
-                       $className = 'wcf\system\option\group\GroupOptionType'.ucfirst($type);
+                       $className = 'wcf\system\option\group\\'.StringUtil::toUpperCase($type).'GroupOptionType';
                        
                        // create instance
                        if (!class_exists($className)) {

diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
index e0f4afaab4cef37241e858ea90840302c5c6c819..14a421a406bca82a527caf101754401ba8445c65 100755 (executable)
--- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php
@@ -294,7 +294,7 @@ class UserSearchForm extends UserOptionListForm {
        }
        
        /**
-        * @see wcf\system\option\SearchableOptionType::getSearchFormElement()
+        * @see wcf\system\option\ISearchableOptionType::getSearchFormElement()
         */
        protected function getFormElement($type, Option $option) {
                return $this->getTypeObject($type)->getSearchFormElement($option);

diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
index 9ec3ccce25de3459cec2359768a4d1001a943514..0c7c78719ae2db52f2795f07f8d26aa30231eb15 100644 (file)
--- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php
@@ -394,7 +394,7 @@ class UsersMassProcessingForm extends UserOptionListForm {
        }
        
        /**
-        * @see wcf\system\option\SearchableOptionType::getSearchFormElement()
+        * @see wcf\system\option\ISearchableOptionType::getSearchFormElement()
         */
        protected function getFormElement($type, &$optionData) {
                return $this->getTypeObject($type)->getSearchFormElement($optionData);

diff --git a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
index cbca991e8283d446fe034fcf74e2efb7ce63853c..4d84984c943e645dfc5a872aee927659ddf5488b 100644 (file)
--- a/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/UserGroupPermissionCacheBuilder.class.php
@@ -103,7 +103,7 @@ class UserGroupPermissionCacheBuilder implements ICacheBuilder {
         */
        protected function getTypeObject($type) {
                if (!isset($this->typeObjects[$type])) {
-                       $className = 'wcf\system\option\group\GroupOptionType'.ucfirst($type);
+                       $className = 'wcf\system\option\group\\'.StringUtil::toUpperCase($type).'GroupOptionType';
                        
                        // validate class
                        if (!class_exists($className)) {

diff --git a/wcfsetup/install/files/lib/system/package/plugin/GroupOptionsPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/GroupOptionsPackageInstallationPlugin.class.php
index 1b5556d0fdd505a734cfc5132562a941da1f4fcf..174195da1324b9d85f3c1c987193a9db56388c10 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/GroupOptionsPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/GroupOptionsPackageInstallationPlugin.class.php
@@ -62,7 +62,7 @@ class GroupOptionsPackageInstallationPlugin extends AbstractOptionPackageInstall
                if (isset($option['options'])) $options = $option['options'];
                
                // check if optionType exists
-               $className = 'wcf\system\option\group\GroupOptionType'.ucfirst($optionType);
+               $className = 'wcf\system\option\group\\'.StringUtil::toUpperCase($type).'GroupOptionType';
                if (!class_exists($className)) {
                        throw new SystemException("unable to find class '".$className."'");
                }

diff --git a/wcfsetup/install/files/lib/system/package/plugin/OptionsPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/OptionsPackageInstallationPlugin.class.php
index 1bb184d6f0588c46064702c320821f3933932250..4806001fe92243378faf29aacd21688eea7130ca 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/OptionsPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/OptionsPackageInstallationPlugin.class.php
@@ -45,7 +45,7 @@ class OptionsPackageInstallationPlugin extends AbstractOptionPackageInstallation
                if (isset($option['options'])) $options = $option['options'];
                
                // check if optionType exists
-               $className = 'wcf\system\option\OptionType'.ucfirst($optionType);
+               $className = 'wcf\system\option\\'.StringUtil::firstCharToUpperCase($optionType).'OptionType';
                if (!class_exists($className)) {
                        throw new SystemException("unable to find class '".$className."'");
                }

diff --git a/wcfsetup/install/files/lib/system/package/plugin/UserOptionsPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/UserOptionsPackageInstallationPlugin.class.php
index dc4cada02542beb56c620e5cf7f09f39c04217e7..027be7b4656c896a2cb5cb26d48be6fa21eb77e3 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/plugin/UserOptionsPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/UserOptionsPackageInstallationPlugin.class.php
@@ -91,7 +91,7 @@ class UserOptionsPackageInstallationPlugin extends AbstractOptionPackageInstalla
                
                
                // check if optionType exists
-               $className = 'wcf\system\option\OptionType'.ucfirst($optionType);
+               $className = 'wcf\system\option\\'.StringUtil::firstCharToUpperCase($optionType).'OptionType';
                if (!class_exists($className)) {
                        throw new SystemException("unable to find class '".$className."'");
                }