diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-02-04 12:10:25 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-02-04 12:10:25 +0000 |
| commit | bd31cb634d545edb0cf17e58962004d6830f3537 (patch) | |
| tree | 2e4f1553ce192a99dca8c67e07857bc6001900cb | |
| parent | cc24876726854e2e799651b1d7e40e54a2c0375b (diff) | |
| download | forums-bd31cb634d545edb0cf17e58962004d6830f3537.tar forums-bd31cb634d545edb0cf17e58962004d6830f3537.tar.gz forums-bd31cb634d545edb0cf17e58962004d6830f3537.tar.bz2 forums-bd31cb634d545edb0cf17e58962004d6830f3537.tar.xz forums-bd31cb634d545edb0cf17e58962004d6830f3537.zip | |
Minor stuff: #20925, #20815
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8375 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/session.php | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 0a8c9b4c8a..e4662d9280 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -450,7 +450,7 @@ <!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW --> {ICON_MOVE_UP_DISABLED} <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> - <!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW--> + <!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW --> <a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a> <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a> <!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW --> diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 0a80f32933..affd447787 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -179,6 +179,10 @@ class session } } } + else + { + $this->forwarded_for = ''; + } // Add forum to the page for tracking online users - also adding a "x" to the end to properly identify the number $this->page['page'] .= (isset($_REQUEST['f'])) ? ((strpos($this->page['page'], '?') !== false) ? '&' : '?') . '_f_=' . (int) $_REQUEST['f'] . 'x' : ''; |