diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-27 14:40:41 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-10-27 14:40:41 +0000 |
| commit | 15195facc2387c3fac215f69592dad350dc734ed (patch) | |
| tree | 9822ac9dd6ad1d27ae1e5931909a0c6e585404f6 /phpBB | |
| parent | 70586666159425c17ee5deb16338ec380caf8ed8 (diff) | |
| download | forums-15195facc2387c3fac215f69592dad350dc734ed.tar forums-15195facc2387c3fac215f69592dad350dc734ed.tar.gz forums-15195facc2387c3fac215f69592dad350dc734ed.tar.bz2 forums-15195facc2387c3fac215f69592dad350dc734ed.tar.xz forums-15195facc2387c3fac215f69592dad350dc734ed.zip | |
two tiny bugfixes
git-svn-id: file:///svn/phpbb/trunk@6532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/auth/auth_apache.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_apache.php b/phpBB/includes/auth/auth_apache.php index 35c266932c..4c8293c707 100644 --- a/phpBB/includes/auth/auth_apache.php +++ b/phpBB/includes/auth/auth_apache.php @@ -136,6 +136,13 @@ function autologin_apache() return ($row['user_type'] == USER_INACTIVE || $row['user_type'] == USER_IGNORE) ? array() : $row; } + if (!function_exists('user_add')) + { + global $phpbb_root_path, $phpEx; + + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } + // create the user if he does not exist yet user_add(user_row_apache($php_auth_user, $php_auth_pw)); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index a1de77bcbd..bb204d524f 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -384,7 +384,7 @@ class ucp_register $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'), + 'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT, 'UTF-8'), 'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") |