mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-07 17:27:16 +02:00
Code Issues Releases Wiki Activity

- some bugfixes

Browse Source 
- bugfixes for the convertor (typecasting for example was totally broken)


git-svn-id: file:///svn/phpbb/trunk@6865 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2007-01-09 14:10:44 +00:00
parent 164fb66f44
commit 2b35b9d60d
15 changed files with 82 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/functions_convert.php
View File

@@ -37,10 +37,13 @@ function still_on_time()
// If zero, then set to something higher to not let the user catch the ten seconds barrier.
if ($max_execution_time === 0)
{
$max_execution_time = 300;
$max_execution_time = 250;
}
$max_execution_time = min(max(10, $max_execution_time), 300);
$max_execution_time = min(max(10, ($max_execution_time - 15)), 250);
// For debugging purposes
// $max_execution_time = 30;
global $starttime;
$start_time = (empty($starttime)) ? $current_time : $starttime;
@@ -1417,8 +1420,12 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting = ACL_NO)
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
$sql = "INSERT INTO $table ($id_field, forum_id, auth_role_id) VALUES ($ug_id, $forum_id, " . $row['role_id'] . ')';
$db->sql_query($sql);
// If we have no role id there is something wrong here
if ($row)
{
$sql = "INSERT INTO $table ($id_field, forum_id, auth_role_id) VALUES ($ug_id, $forum_id, " . $row['role_id'] . ')';
$db->sql_query($sql);
}
return;
}