mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 14:30:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/7717] Localise default extension groups for attachments
  [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
  [ticket/9173] No longer limit scope of numbers we store in the config table on
  [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
  [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
  [ticket/9518] Correctly create new connection on PostgreSQL when new connection is forced.
  [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
  [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
  [feature/remote_upload-filesize] Also check HTTP content-length before actually starting the file transfer.
  [feature/remote_upload-filesize] When transferring files from a remote webserver, abort the transfer as soon as the allowed filesize has been exceeded.
  [ticket/9176] Take current board timezone settings into account when setting board date format.
This commit is contained in:
Nils Adermann
2010-05-14 02:51:56 +02:00
parent 0ed69d91b2 478708346e
commit cf89952106
10 changed files with 134 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
phpBB/install/database_update.php
View File

@@ -913,6 +913,8 @@ function database_update_info()
'3.0.7-RC2' => array(),
// No changes from 3.0.7 to 3.0.7-PL1
'3.0.7' => array(),
// No changes from 3.0.7-PL1 to 3.0.8-RC1
'3.0.7-PL1' => array(),
);
}
@@ -923,7 +925,7 @@ function database_update_info()
*****************************************************************************/
function change_database_data(&$no_updates, $version)
{
global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx;
global $db, $errored, $error_ary, $config, $phpbb_root_path, $phpEx, $user;
switch ($version)
{
@@ -1648,6 +1650,43 @@ function change_database_data(&$no_updates, $version)
// No changes from 3.0.7 to 3.0.7-PL1
case '3.0.7':
break;
// Changes from 3.0.7-PL1 to 3.0.8-RC1
case '3.0.7-PL1':
$user->add_lang('acp/attachments');
$extension_groups = array(
$user->lang['EXT_GROUP_ARCHIVES'] => 'ARCHIVES',
$user->lang['EXT_GROUP_DOCUMENTS'] => 'DOCUMENTS',
$user->lang['EXT_GROUP_DOWNLOADABLE_FILES'] => 'DOWNLOADABLE_FILES',
$user->lang['EXT_GROUP_FLASH_FILES'] => 'FLASH_FILES',
$user->lang['EXT_GROUP_IMAGES'] => 'IMAGES',
$user->lang['EXT_GROUP_PLAIN_TEXT'] => 'PLAIN_TEXT',
$user->lang['EXT_GROUP_QUICKTIME_MEDIA'] => 'QUICKTIME_MEDIA',
$user->lang['EXT_GROUP_REAL_MEDIA'] => 'REAL_MEDIA',
$user->lang['EXT_GROUP_WINDOWS_MEDIA'] => 'WINDOWS_MEDIA',
);
$sql = 'SELECT group_id, group_name
FROM ' . EXTENSION_GROUPS_TABLE;
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
if (isset($extension_groups[$row['group_name']]))
{
$sql_ary = array(
'group_name' => $extension_groups[$row['group_name']],
);
$sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . '
WHERE group_id = ' . (int) $row['group_id'];
_sql($sql, $errored, $error_ary);
}
}
$db->sql_freeresult($result);
$no_updates = false;
break;
}
}