aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-01-29 14:35:29 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-01-29 14:35:29 +0000
commite970da651479853156a7f1d7d9407d787c694bed (patch)
tree3ad0132b840c6ababa4121a0b53c3abaa96f4481 /phpBB/includes
parent1819be3ed12eafa6582e4b605196c74e0a7d8f95 (diff)
downloadforums-e970da651479853156a7f1d7d9407d787c694bed.tar
forums-e970da651479853156a7f1d7d9407d787c694bed.tar.gz
forums-e970da651479853156a7f1d7d9407d787c694bed.tar.bz2
forums-e970da651479853156a7f1d7d9407d787c694bed.tar.xz
forums-e970da651479853156a7f1d7d9407d787c694bed.zip
Merge revision #r8334
git-svn-id: file:///svn/phpbb/trunk@8345 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_main.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php
index 6a5c9c3050..57bb52f27b 100644
--- a/phpBB/includes/acp/acp_main.php
+++ b/phpBB/includes/acp/acp_main.php
@@ -389,7 +389,7 @@ class acp_main
'DATABASE_INFO' => $db->sql_server_info(),
'BOARD_VERSION' => $config['version'],
- 'U_ACTION' => append_sid("{$phpbb_admin_path}index.$phpEx"),
+ 'U_ACTION' => $this->u_action,
'U_ADMIN_LOG' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=logs&amp;mode=admin'),
'U_INACTIVE_USERS' => append_sid("{$phpbb_admin_path}index.$phpEx", 'i=inactive&amp;mode=list'),