Merge remote branch 'mainline/master'

Conflicts:
	etc/inc/filter.inc

1 files changed, 6 insertions, 0 deletions

diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index 3c941e6..bc210a1 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -193,6 +193,12 @@ include("head.inc");
   </td>
   <td class="listr" ondblclick="document.location='firewall_aliases_edit.php?id=<?=$i;?>';">
       <?php
+	if ($alias["url"]) {
+		echo $alias["url"] . "<br/>";
+	}
+	if ($alias["aliasurl"]) {
+		echo $alias["aliasurl"] . "<br/>";
+	}
 	$tmpaddr = explode(" ", $alias['address']);
 	$addresses = implode(", ", array_slice($tmpaddr, 0, 10));
 	echo $addresses;