From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 12 Aug 2011 21:08:52 +0000 (+0200)
Subject: Adjustments because of option type class name changes
X-Git-Tag: 2.0.0_Beta_1~1858^2^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9002e1d2f11b49966f5cdefea1da0b074b62f9dd;p=GitHub%2FWoltLab%2FWCF.git

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 ded1777342..501959d7ae 100755
--- 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 5094c19161..d2f7d51083 100755
--- 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 e0f4afaab4..14a421a406 100755
--- 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 9ec3ccce25..0c7c78719a 100644
--- 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/CacheBuilderUserGroupPermission.class.php b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php
index 81e76303f7..64877e00bb 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderUserGroupPermission.class.php
@@ -104,7 +104,7 @@ class CacheBuilderUserGroupPermission 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 1b5556d0fd..174195da13 100644
--- 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 1bb184d6f0..4806001fe9 100644
--- 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 dc4cada025..027be7b465 100644
--- 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."'");
 		}