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

misc SQLite bugs

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@8101 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
2007-09-22 21:58:04 +00:00
parent 7f65bc98ad
commit 6ea4a146af
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/includes/acp/acp_profile.php
View File

@@ -138,6 +138,12 @@ class acp_profile
foreach ($old_table_cols as $declaration) foreach ($old_table_cols as $declaration)
{ {
$entities = preg_split('#\s+#', trim($declaration)); $entities = preg_split('#\s+#', trim($declaration));
if ($entities[0] == 'PRIMARY')
{
continue;
}
if ($entities[0] !== 'pf_' . $field_ident) if ($entities[0] !== 'pf_' . $field_ident)
{ {
$column_list[] = $entities[0]; $column_list[] = $entities[0];
@@ -1431,7 +1437,7 @@ class acp_profile
foreach ($old_table_cols as $declaration) foreach ($old_table_cols as $declaration)
{ {
$entities = preg_split('#\s+#', trim($declaration)); $entities = preg_split('#\s+#', trim($declaration));
if ($entities == 'PRIMARY') if ($entities[0] == 'PRIMARY')
{ {
continue; continue;
} }

2
phpBB/includes/db/db_tools.php
View File

@@ -962,7 +962,7 @@ class phpbb_db_tools
foreach ($old_table_cols as $declaration) foreach ($old_table_cols as $declaration)
{ {
$entities = preg_split('#\s+#', trim($declaration)); $entities = preg_split('#\s+#', trim($declaration));
if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name') if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
{ {
continue; continue;
} }

2
phpBB/install/database_update.php
View File

@@ -2188,7 +2188,7 @@ function sql_column_remove($dbms, $table_name, $column_name)
foreach ($old_table_cols as $declaration) foreach ($old_table_cols as $declaration)
{ {
$entities = preg_split('#\s+#', trim($declaration)); $entities = preg_split('#\s+#', trim($declaration));
if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name') if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name)
{ {
continue; continue;
} }