Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp

Conflicts:
	etc/inc/interfaces.inc
	etc/inc/pfsense-utils.inc

2 files changed, 9 insertions, 9 deletions

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 415ced4..b84d8b0 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -155,7 +155,7 @@ if ($_POST) {
 
 	if (isset($id) && ($a_vip[$id])) {
 		if ($a_vip[$id]['mode'] != $_POST['mode'])
-			interface_bring_down($a_vip[$id]);
+			interface_bring_down($a_vip[$id]['interface']);
 	}
 
 	if (!$input_errors) {
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 33a2b7d..f35ae64 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -44,14 +44,14 @@
 ##|*MATCH=interfaces.php*
 ##|-PRIV
 
-require("guiconfig.inc");
-require("ipsec.inc");
-require("functions.inc");
-require("captiveportal.inc");
-require("filter.inc");
-require("shaper.inc");
-require("rrd.inc");
-require("vpn.inc");
+require_once("guiconfig.inc");
+require_once("ipsec.inc");
+require_once("functions.inc");
+require_once("captiveportal.inc");
+require_once("filter.inc");
+require_once("shaper.inc");
+require_once("rrd.inc");
+require_once("vpn.inc");
 
 if ($_REQUEST['if']) {
 	$if = $_REQUEST['if'];