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

Fixing converter bugs.

Browse source 
#21215
#18575
#18435
#16565



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8379 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof 2008-02-13 16:28:37 +00:00
parent bd31cb634d
commit d7c5f502b4
6 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/constants.php
View file

@ -173,7 +173,7 @@ define('FIELD_DATE', 6);
// Additional constants
define('VOTE_CONVERTED', 9999);
define('VOTE_CONVERTED', 127);
// Table names
define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups');

2
phpBB/includes/functions_convert.php
View file

@ -1282,7 +1282,7 @@ function restore_config($schema)
// Most are...
if (is_string($config_value))
{
$config_value = utf8_htmlspecialchars($config_value);
$config_value = truncate_string(utf8_htmlspecialchars($config_value), 255, false);
}
set_config($config_name, $config_value);

8
phpBB/includes/functions_user.php
View file

@ -143,7 +143,11 @@ function user_update_name($old_name, $new_name)
}
/**
* Add User
* Adds an user
*
* @param mixed $user_row An array containing the following keys (and the appropriate values): username, group_id (the group to place the user in), user_email and the user_type(usually 0). Additional entries not overridden by defaults will be forwarded.
* @param string $cp_data custom profile fields, see custom_profile::build_insert_sql_array
* @return: the new user's ID.
*/
function user_add($user_row, $cp_data = false)
{
@ -281,7 +285,7 @@ function user_add($user_row, $cp_data = false)
$sql = 'SELECT group_colour
FROM ' . GROUPS_TABLE . '
WHERE group_id = ' . $user_row['group_id'];
WHERE group_id = ' . (int) $user_row['group_id'];
$result = $db->sql_query_limit($sql, 1);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);

6
phpBB/install/convertors/convert_phpbb20.php
View file

@ -482,14 +482,16 @@ if (!$get_info)
array('topic_moved_id', 0, ''),
array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'),
array('topic_first_post_id', 'topics.topic_first_post_id', ''),
array('topic_last_view_time', 'posts.post_time', ''),
array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')),
array('poll_start', 'vote_desc.vote_start', 'null_to_zero'),
array('poll_length', 'vote_desc.vote_length', 'null_to_zero'),
array('poll_max_options', 1, ''),
array('poll_vote_change', 0, ''),
'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
'left_join' => array ( 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1',
'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id',
),
'where' => 'topics.topic_moved_id = 0',
),

2
phpBB/install/convertors/functions_phpbb20.php
View file

@ -455,7 +455,7 @@ function phpbb_get_birthday($birthday = '')
{
$birthday = (int) $birthday;
if (!$birthday || $birthday == 999999 || $birthday < 0)
if (!$birthday || $birthday == 999999 || ((version_compare(PHP_VERSION, '5.1.0') < 0) && $birthday < 0))
{
return ' 0- 0- 0';
}

10
phpBB/install/database_update.php
View file

@ -1559,6 +1559,16 @@ if (version_compare($current_version, '3.0.RC5', '<='))
$no_updates = false;
}
if (version_compare($current_version, '3.0.0', '<='))
{
$sql = 'UPDATE ' . TOPICS_TABLE . "
SET topic_last_view_time = topic_last_post_time
WHERE topic_last_view_time = 0";
_sql($sql, $errored, $error_ary);
// TODO: remove all form token min times
}
_write_result($no_updates, $errored, $error_ary);
$error_ary = array();