diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 13:47:12 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 13:47:12 +0000 |
| commit | e3889a72e802c4dfea6812f9ff29f5acdd302a76 (patch) | |
| tree | 9e067264629f12373f38d22d95f1537b7c250678 | |
| parent | dd5f0c320d133dab3291753a6173f60b2e394b56 (diff) | |
| download | forums-e3889a72e802c4dfea6812f9ff29f5acdd302a76.tar forums-e3889a72e802c4dfea6812f9ff29f5acdd302a76.tar.gz forums-e3889a72e802c4dfea6812f9ff29f5acdd302a76.tar.bz2 forums-e3889a72e802c4dfea6812f9ff29f5acdd302a76.tar.xz forums-e3889a72e802c4dfea6812f9ff29f5acdd302a76.zip | |
hard to spot...
git-svn-id: file:///svn/phpbb/trunk@6658 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 4 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 7198cfaaf3..92612bfa28 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -139,7 +139,7 @@ class ucp_profile $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($username), + 'USERNAME' => htmlspecialchars_decode($data['username']), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") ); @@ -172,7 +172,7 @@ class ucp_profile $messenger->im($row['user_jabber'], $row['username']); $messenger->assign_vars(array( - 'USERNAME' => htmlspecialchars_decode($username), + 'USERNAME' => htmlspecialchars_decode($data['username']), 'U_USER_DETAILS' => "$server_url/memberlist.$phpEx?mode=viewprofile&u={$user->data['user_id']}", 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") ); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 5ffef1c2da..539a180846 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -825,7 +825,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data) break; case 'oracle': - $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $coumn_data['column_type_sql']; + $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' ' . $column_data['column_type_sql']; _sql($sql, $errored, $error_ary); break; @@ -888,7 +888,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data) } else { - $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $colum_data['column_type_sql'] . ']'; + $sql = 'ALTER TABLE ' . $table_name . ' ADD ' . $column_name . ' [' . $column_data['column_type_sql'] . ']'; _sql($sql, $errored, $error_ary); } break; @@ -901,6 +901,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data) function sql_column_change($dbms, $table_name, $column_name, $column_data) { global $dbms_type_map, $db; + global $errored, $error_ary; $column_data = prepare_column_data($dbms, $column_data); |