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

#13463

Browse source 
- tiny issue with get_tables()


git-svn-id: file:///svn/phpbb/trunk@7893 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-07-16 01:06:34 +00:00
parent ddff6f134c
commit 3158d0897e
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/docs/CHANGELOG.html
View file

@ -247,6 +247,8 @@ p a {
<li>[Fix] Explain that themes which need parsing cannot be stored on the filesystem (Bug #11134)</li> <li>[Fix] Explain that themes which need parsing cannot be stored on the filesystem (Bug #11134)</li>
<li>[Fix] Normalize usernames</li> <li>[Fix] Normalize usernames</li>
<li>[Change] Improved utf8_clean_string with a more complete list of homographs and NFKC normalization</li> <li>[Change] Improved utf8_clean_string with a more complete list of homographs and NFKC normalization</li>
<li>[Fix] Fixed error messages that ACP Database can give (Bug #13463)</li>
<li>[Fix] Fixed potential issues with databases that use tables names is uppercase</li>
</ul> </ul>

6
phpBB/includes/acp/acp_database.php
View file

@ -48,7 +48,7 @@ class acp_database
if (!sizeof($table)) if (!sizeof($table))
{ {
trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action)); trigger_error($user->lang['TABLE_SELECT_ERROR'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$store = $download = $structure = $schema_data = false; $store = $download = $structure = $schema_data = false;
@ -165,7 +165,7 @@ class acp_database
$tables = get_tables($db); $tables = get_tables($db);
foreach ($tables as $table_name) foreach ($tables as $table_name)
{ {
if (strlen($table_prefix) === 0 || strpos($table_name, $table_prefix) === 0) if (strlen($table_prefix) === 0 || stripos($table_name, $table_prefix) === 0)
{ {
$template->assign_block_vars('tables', array( $template->assign_block_vars('tables', array(
'TABLE' => $table_name 'TABLE' => $table_name
@ -343,7 +343,7 @@ class acp_database
{ {
if ($sub === false) if ($sub === false)
{ {
trigger_error($user->lang['RESTORE_FAILURE'] . adm_back_link($this->u_action)); trigger_error($user->lang['RESTORE_FAILURE'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
pg_put_line($db->db_connect_id, $sub . "\n"); pg_put_line($db->db_connect_id, $sub . "\n");
} }

1
phpBB/includes/functions_install.php
View file

@ -324,6 +324,7 @@ function connect_check_db($error_connect, &$error, $dbms, $table_prefix, $dbhost
$table_ary = array($temp_prefix . 'attachments', $temp_prefix . 'config', $temp_prefix . 'sessions', $temp_prefix . 'topics', $temp_prefix . 'users'); $table_ary = array($temp_prefix . 'attachments', $temp_prefix . 'config', $temp_prefix . 'sessions', $temp_prefix . 'topics', $temp_prefix . 'users');
$tables = get_tables($db); $tables = get_tables($db);
$tables = array_map('strtolower', $tables);
$table_intersect = array_intersect($tables, $table_ary); $table_intersect = array_intersect($tables, $table_ary);
if (sizeof($table_intersect)) if (sizeof($table_intersect))

1
phpBB/install/install_convert.php
View file

@ -463,6 +463,7 @@ class install_convert extends module
$prefixes = array(); $prefixes = array();
$tables_existing = get_tables($src_db); $tables_existing = get_tables($src_db);
$tables_existing = array_map('strtolower', $tables_existing);
foreach ($tables_existing as $table_name) foreach ($tables_existing as $table_name)
{ {
compare_table($tables, $table_name, $prefixes); compare_table($tables, $table_name, $prefixes);