makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

hard to spot...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@6658 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2006-11-26 13:47:12 +00:00
parent dd5f0c320d
commit e3889a72e8
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/ucp/ucp_profile.php
View file

@ -139,7 +139,7 @@ class ucp_profile
$messenger->headers('X-AntiAbuse: User IP - ' . $user->ip); $messenger->headers('X-AntiAbuse: User IP - ' . $user->ip);
$messenger->assign_vars(array( $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") '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->im($row['user_jabber'], $row['username']);
$messenger->assign_vars(array( $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_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") 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey")
); );

5
phpBB/install/database_update.php
View file

@ -825,7 +825,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data)
break; break;
case 'oracle': 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); _sql($sql, $errored, $error_ary);
break; break;
@ -888,7 +888,7 @@ function sql_column_add($dbms, $table_name, $column_name, $column_data)
} }
else 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); _sql($sql, $errored, $error_ary);
} }
break; 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) function sql_column_change($dbms, $table_name, $column_name, $column_data)
{ {
global $dbms_type_map, $db; global $dbms_type_map, $db;
global $errored, $error_ary;
$column_data = prepare_column_data($dbms, $column_data); $column_data = prepare_column_data($dbms, $column_data);