1 files changed, 17 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/includes/ucp/ucp_pm_options.php
index e80c0672cf..58c2d087c8 100644
--- a/phpBB/includes/ucp/ucp_pm_options.php
+++ b/phpBB/includes/ucp/ucp_pm_options.php
@@ -637,12 +637,29 @@ function define_action_option($hardcoded, $action_option, $action_lang, $folder)
 function define_rule_option($hardcoded, $rule_option, $rule_lang, $check_ary)
 {
 	global $template;
+	global $module;
+
+	$exclude = array();
+
+	if (!$module->loaded('zebra', 'friends'))
+	{
+		$exclude[RULE_IS_FRIEND] = true;
+	}
+
+	if (!$module->loaded('zebra', 'foes'))
+	{
+		$exclude[RULE_IS_FOE] = true;
+	}
 
 	$s_rule_options = '';
 	if (!$hardcoded)
 	{
 		foreach ($check_ary as $value => $_check)
 		{
+			if (isset($exclude[$value]))
+			{
+				continue;
+			}
 			$s_rule_options .= '<option value="' . $value . '"' . (($value == $rule_option) ? ' selected="selected"' : '') . '>' . $rule_lang[$value] . '</option>';
 		}
 	}