From 8237386f8322e5fafc08db58564d393f2bb751d6 Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Fri, 18 May 2012 17:26:22 +0200 Subject: [PATCH] Removed deprecated methods Closes #599 --- .../files/lib/acp/form/OptionForm.class.php | 8 -------- .../files/lib/acp/form/UserAddForm.class.php | 10 ---------- .../files/lib/acp/form/UserSearchForm.class.php | 15 --------------- .../acp/form/UsersMassProcessingForm.class.php | 16 ---------------- 4 files changed, 49 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php index 96affb7ab5..58cd1ea5ef 100644 --- a/wcfsetup/install/files/lib/acp/form/OptionForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/OptionForm.class.php @@ -138,12 +138,4 @@ class OptionForm extends AbstractOptionListForm { // show form parent::show(); } - - /** - * @see wcf\acp\form\AbstractOptionListForm::checkOption() - */ - protected static function checkOption(Option $option) { - if (!parent::checkOption($option)) return false; - return ($option->hidden != 1); - } } diff --git a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php index a985beef90..eac4470fd1 100644 --- a/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserAddForm.class.php @@ -329,14 +329,4 @@ class UserAddForm extends UserOptionListForm { // show form parent::show(); } - - /** - * @see wcf\acp\form\AbstractOptionListForm::checkOption() - */ - /* - protected static function checkOption(Option $option) { - if (!parent::checkOption($option)) return false; - - return ($option->editable != 1 && $option->editable != 4 && !$option->disabled); - }*/ } diff --git a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php index 0e9b037ccb..b8eeabc29d 100755 --- a/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserSearchForm.class.php @@ -308,19 +308,4 @@ class UserSearchForm extends UserOptionListForm { $this->optionHandler->getTypeObject($option->optionType)->getCondition($this->conditions, $option->getDecoratedObject(), $value); } } - - /** - * @see wcf\system\option\ISearchableOptionType::getSearchFormElement() - */ - protected function getFormElement($type, Option $option) { - return $this->getTypeObject($type)->getSearchFormElement($option); - } - - /** - * @see wcf\acp\form\DynamicOptionListForm::checkOption() - * @todo deprecated? - */ - protected static function checkOption(Option $option) { - return ($option->searchable == 1 && !$option->disabled && ($option->visible == 3 || $option->visible < 2)); - } } diff --git a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php index 66e4ed9b92..d8ee799b69 100644 --- a/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UsersMassProcessingForm.class.php @@ -393,20 +393,4 @@ class UsersMassProcessingForm extends UserOptionListForm { // show form parent::show(); } - - /** - * @see wcf\system\option\ISearchableOptionType::getSearchFormElement() - */ - /* - protected function getFormElement($type, &$optionData) { - return $this->getTypeObject($type)->getSearchFormElement($optionData); - }*/ - - /** - * @see wcf\acp\form\AbstractOptionListForm::checkOption() - */ - /* - protected static function checkOption(Option $option) { - return ($option->searchable == 1 && !$option->disabled && ($option->visible == 3 || $option->visible < 2)); - }*/ } -- 2.20.1