diff options
author | Jim P <jim@pingle.org> | 2012-11-12 06:05:07 -0800 |
---|---|---|
committer | Jim P <jim@pingle.org> | 2012-11-12 06:05:07 -0800 |
commit | 75de894f726c4090f4d5be683d77c0736624631a (patch) | |
tree | e334574213929778383638d1f1fe69a577b9a5f4 /usr | |
parent | 32837bb4ee1c687e40e0da5abcbce100149f84e1 (diff) | |
parent | 95a3099eae7744488078e985b3f8ff125f7cd683 (diff) | |
download | pfsense-75de894f726c4090f4d5be683d77c0736624631a.zip pfsense-75de894f726c4090f4d5be683d77c0736624631a.tar.gz |
Merge pull request #249 from thomasnoel/RELENG_2_0
cherry-pick last commits to RELENG_2_0
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/diag_states_summary.php | 2 | ||||
-rwxr-xr-x | usr/local/www/guiconfig.inc | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php index fa49563..b273d9d 100644 --- a/usr/local/www/diag_states_summary.php +++ b/usr/local/www/diag_states_summary.php @@ -103,6 +103,8 @@ function sort_by_ip($a, $b) { } function build_port_info($portarr, $proto) { + if (!$portarr) + return ''; $ports = array(); asort($portarr); foreach (array_reverse($portarr, TRUE) as $port => $count) { diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc index 1241fd2..995e196 100755 --- a/usr/local/www/guiconfig.inc +++ b/usr/local/www/guiconfig.inc @@ -42,7 +42,6 @@ if(!$nocsrf) { } require_once("csrf/csrf-magic.php"); } -require_once("authgui.inc"); /* make sure nothing is cached */ if (!$omit_nocacheheaders) { @@ -53,6 +52,8 @@ if (!$omit_nocacheheaders) { header("Pragma: no-cache"); } +require_once("authgui.inc"); + /* parse the configuration and include all configuration functions */ require_once("functions.inc"); @@ -1079,4 +1080,4 @@ function rule_popup($src,$srcport,$dst,$dstport){ } } -?>
\ No newline at end of file +?> |