From: Alexander Ebert Date: Mon, 23 Jan 2012 20:52:04 +0000 (+0100) Subject: Partially fixed group edit X-Git-Tag: 2.0.0_Beta_1~1402 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3c36074063a2c31e2a13655b6c5430e72383404;p=GitHub%2FWoltLab%2FWCF.git Partially fixed group edit --- diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php index ee07b70666..cfa9239b97 100755 --- a/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupEditForm.class.php @@ -69,22 +69,23 @@ class UserGroupEditForm extends UserGroupAddForm { if (!count($_POST)) { I18nHandler::getInstance()->setOptions('groupName', 1, $this->group->groupName, 'wcf.acp.group.group\d+'); $this->groupName = $this->group->groupName; + $options = $this->optionHandler->getCategoryOptions(); // get default values if ($this->group->groupType != UserGroup::EVERYONE) { $defaultGroup = UserGroup::getGroupByType(UserGroup::EVERYONE); - foreach ($this->options as $option) { - $value = $defaultGroup->getGroupOption($option->optionName); + foreach ($options as $option) { + $value = $defaultGroup->getGroupOption($option['object']->optionName); if ($value !== null) { - $this->optionValues[$option->optionName] = $value; + $this->optionValues[$option['object']->optionName] = $value; } } } - foreach ($this->options as $option) { - $value = $this->group->getGroupOption($option->optionName); + foreach ($options as $option) { + $value = $this->group->getGroupOption($option['object']->optionName); if ($value !== null) { - $this->optionValues[$option->optionName] = $value; + $this->optionValues[$option['object']->optionName] = $value; } } }