Partial revert of 5b431a20dea since the introduced parameter is not working as expected

1 files changed, 4 insertions, 9 deletions

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index bad9087..b6dac30 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -492,7 +492,7 @@ function filter_generate_nested_alias($name, $alias, &$aliasnesting, &$aliasaddr
 	return $finallist;
 }
 
-function filter_expand_alias($alias_name, $all = false)
+function filter_expand_alias($alias_name)
 {
 	global $config;
 
@@ -501,19 +501,14 @@ function filter_expand_alias($alias_name, $all = false)
 			if($aliased['name'] == $alias_name) {
 				$aliasnesting = array();
 				$aliasaddrnesting = array();
-				$result = filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting);
-				if ($all === true)
-					foreach ($aliasaddrnesting as $addr)
-						if (!preg_match("/\s*$addr\s*/", $result))
-							$result .= " {$addr}";
-				return $result;
+				return filter_generate_nested_alias($aliased['name'], $aliased['address'], $aliasnesting, $aliasaddrnesting);
 			}
 		}
 	}
 }
 
-function filter_expand_alias_array($alias_name, $all = false) {
-	$expansion = filter_expand_alias($alias_name, $all);
+function filter_expand_alias_array($alias_name) {
+	$expansion = filter_expand_alias($alias_name);
 	return explode(" ", preg_replace('/\s+/', ' ', trim($expansion)));
 }