aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-06-21 10:40:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-06-21 10:40:52 +0000
commitf056e205add6b956b2e63a28a1d0b4062671c490 (patch)
tree99fd0eec4684fd6e9c613a53bcffb3cfae21b40b /phpBB/includes/functions.php
parent050567483f8646a58b91e4abeb2bf61f735b0526 (diff)
downloadforums-f056e205add6b956b2e63a28a1d0b4062671c490.tar
forums-f056e205add6b956b2e63a28a1d0b4062671c490.tar.gz
forums-f056e205add6b956b2e63a28a1d0b4062671c490.tar.bz2
forums-f056e205add6b956b2e63a28a1d0b4062671c490.tar.xz
forums-f056e205add6b956b2e63a28a1d0b4062671c490.zip
rename user_id in confirm_box to confirm_uid. We are able to do this because confirm_box is completely transparent to the outside.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9641 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index c5216f7f6f..dd82f9e53d 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2496,7 +2496,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
if ($check && $confirm)
{
- $user_id = request_var('user_id', 0);
+ $user_id = request_var('confirm_uid', 0);
$session_id = request_var('sess', '');
$confirm_key = request_var('confirm_key', '');
@@ -2518,10 +2518,10 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
}
$s_hidden_fields = build_hidden_fields(array(
- 'user_id' => $user->data['user_id'],
- 'sess' => $user->session_id,
- 'sid' => $user->session_id)
- );
+ 'confirm_uid' => $user->data['user_id'],
+ 'sess' => $user->session_id,
+ 'sid' => $user->session_id,
+ ));
// generate activation key
$confirm_key = gen_rand_string(10);