Merge remote branch 'mainline/master'

Conflicts:
	usr/local/www/system_gateway_groups.php
	usr/local/www/system_gateway_groups_edit.php
	usr/local/www/system_gateways_edit.php

1 files changed, 4 insertions, 0 deletions

diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
index e580a8b..1c4a95e 100755
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -73,6 +73,10 @@ if ($_POST) {
 if ($_GET['act'] == "del") {
 	if ($a_gateway_groups[$_GET['id']]) {
 		$changedesc .= gettext("removed gateway group") . " {$_GET['id']}";
+		foreach ($config['filter']['rule'] as $idx => $rule) {
+			if ($rule['gateway'] == $a_gateway_groups[$_GET['id']]['name'])
+				unset($config['filter']['rule'][$idx]['gateway']);
+		}
 		unset($a_gateway_groups[$_GET['id']]);
 		write_config($changedesc);
 		mark_subsystem_dirty('staticroutes');