Fixed missing consideration of module settings

diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 00697fca13e1019d08767babdb75248a5b41d859..8f154aa0af166f60b25669bf3347ca7f2ad2efef 100644 (file)
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1185,6 +1185,7 @@ retro:wcf.acp.option.gravatar_default_type.retro</selectoptions>
                                <defaultvalue>150</defaultvalue>
                                <minvalue>0</minvalue>
                                <suffix>pixel</suffix>
+                               <options>module_user_signature</options>
                        </option>
                        <!-- /user.signature -->
                        

diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index 0bf90ccde544f1cffc580e0a6b7a603fd50a6c13..339d220fae62e87463997cdb89aa0b68e0c09e4e 100644 (file)
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -767,6 +767,7 @@ png</defaultvalue>
                                <defaultvalue>0</defaultvalue>
                                <moddefaultvalue>1</moddefaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <option name="mod.profileComment.canDeleteComment">
                                <categoryname>mod.profileComment</categoryname>
@@ -774,6 +775,7 @@ png</defaultvalue>
                                <defaultvalue>0</defaultvalue>
                                <moddefaultvalue>1</moddefaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <option name="mod.profileComment.canModerateComment">
                                <categoryname>mod.profileComment</categoryname>
@@ -781,6 +783,7 @@ png</defaultvalue>
                                <defaultvalue>0</defaultvalue>
                                <moddefaultvalue>1</moddefaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <!-- /mod.general -->
                        
@@ -833,12 +836,14 @@ png</defaultvalue>
                                <categoryname>user.profileComment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <option name="user.profileComment.canEditComment">
                                <categoryname>user.profileComment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>1</defaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <option name="user.profileComment.canDeleteComment">
                                <categoryname>user.profileComment</categoryname>
@@ -846,12 +851,14 @@ png</defaultvalue>
                                <defaultvalue>0</defaultvalue>
                                <admindefaultvalue>1</admindefaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <option name="user.profileComment.canDeleteCommentInOwnProfile">
                                <categoryname>user.profileComment</categoryname>
                                <optiontype>boolean</optiontype>
                                <defaultvalue>0</defaultvalue>
                                <usersonly>1</usersonly>
+                               <options>module_user_profile_wall</options>
                        </option>
                        <!-- /user.profileComment -->
                        

diff --git a/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php b/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
index fc6663282ae87ea539f6e569fb81de2f0aebda06..5f6425a588b00ce3552ef3f54465bed7b649d03d 100644 (file)
--- a/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
+++ b/wcfsetup/install/files/lib/system/condition/UserAvatarCondition.class.php
@@ -92,12 +92,16 @@ class UserAvatarCondition extends AbstractSelectCondition implements IContentCon
         * @inheritDoc
         */
        protected function getOptions() {
-               return [
+               $options = [
                        self::NO_SELECTION_VALUE => 'wcf.global.noSelection',
                        self::NO_AVATAR => 'wcf.user.condition.avatar.noAvatar',
-                       self::AVATAR => 'wcf.user.condition.avatar.avatar',
-                       self::GRAVATAR => 'wcf.user.condition.avatar.gravatar'
+                       self::AVATAR => 'wcf.user.condition.avatar.avatar'
                ];
+               if (MODULE_GRAVATAR) {
+                       $options[self::GRAVATAR] = 'wcf.user.condition.avatar.gravatar';
+               }
+               
+               return $options;
        }
        
        /**