From 800aaf209659f237a19338689f45762c989a80e8 Mon Sep 17 00:00:00 2001 From: Kimura Youichi Date: Mon, 20 Feb 2017 16:38:05 +0900 Subject: [PATCH] apply is_allow_web_public_flag_age setting to register-input form (refs #3453) --- .../MemberConfigPublicFlagForm.class.php | 11 ----------- lib/form/doctrine/MemberConfigForm.class.php | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php index 9047bae36..60066187a 100644 --- a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php +++ b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php @@ -27,16 +27,5 @@ public function __construct(Member $member = null, $options = array(), $CSRFSecr { unset($this['profile_page_public_flag']); } - - if (!opConfig::get('is_allow_web_public_flag_age')) - { - $widget = $this->widgetSchema['age_public_flag']; - - $choices = $widget->getOption('choices'); - unset($choices[4]); - $widget->setOption('choices', $choices); - - $this->validatorSchema['age_public_flag']->setOption('choices', array_keys($choices)); - } } } diff --git a/lib/form/doctrine/MemberConfigForm.class.php b/lib/form/doctrine/MemberConfigForm.class.php index a3546a585..011006208 100644 --- a/lib/form/doctrine/MemberConfigForm.class.php +++ b/lib/form/doctrine/MemberConfigForm.class.php @@ -95,6 +95,12 @@ public function setMemberConfigSettings() $categories = sfConfig::get('openpne_member_category'); $configs = sfConfig::get('openpne_member_config'); + if (!opConfig::get('is_allow_web_public_flag_age') && isset($configs['age_public_flag']['Choices'][4])) + { + // Remove `All Users on the Web` choice from age_public_flag setting + unset($configs['age_public_flag']['Choices'][4]); + } + if (!$this->category) { $this->memberConfigSettings = $configs; return true;