diff options
| author | jim-p <jimp@pfsense.org> | 2012-08-17 10:43:12 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2012-08-17 10:43:12 -0400 |
| commit | be9c20c7a18277c5c5b8d54fabcb1f5464472439 (patch) | |
| tree | c21eb93454268063c1adfa19756f201e31e7a1aa /usr/local | |
| parent | dc3e3acb9ba8329b73ac37ebfa938f5e9e31d248 (diff) | |
| download | pfsense-be9c20c7a18277c5c5b8d54fabcb1f5464472439.zip pfsense-be9c20c7a18277c5c5b8d54fabcb1f5464472439.tar.gz | |
Use REQUEST_URI here so the GET parameters are preserved (makes the links work better for things like interfaces.php?if=wan, and packages.
Diffstat (limited to 'usr/local')
| -rwxr-xr-x | usr/local/www/fbegin.inc | 2 | ||||
| -rw-r--r-- | usr/local/www/shortcuts.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index 6766dd6..bb11869 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -386,7 +386,7 @@ function add_to_menu($url, $name) { ?> <div> -<span class="pgtitle"><a href="<?= $_SERVER['SCRIPT_NAME'] ?>"><?=genhtmltitle($pgtitle);?></a></span> +<span class="pgtitle"><a href="<?= $_SERVER['REQUEST_URI'] ?>"><?=genhtmltitle($pgtitle);?></a></span> <span style="float:right; margin: 0 0 20px 20px"> <?php if (!$hide_service_status && !empty($shortcuts[$shortcut_section]['service'])) { diff --git a/usr/local/www/shortcuts.inc b/usr/local/www/shortcuts.inc index ca42593..830b258 100644 --- a/usr/local/www/shortcuts.inc +++ b/usr/local/www/shortcuts.inc @@ -92,7 +92,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = $link = $shortcuts[$shortcut_section]['main']; break; } - if(!empty($link) && ($_SERVER['SCRIPT_NAME'] != "/{$link}")) + if(!empty($link) && ($_SERVER['REQUEST_URI'] != "/{$link}")) return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><img style=\"vertical-align:middle\" src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" border=\"0\"></a>"; } |
