diff options
| -rw-r--r-- | phpBB/includes/acp/acp_profile.php | 8 | ||||
| -rw-r--r-- | phpBB/includes/db/db_tools.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/includes/acp/acp_profile.php index c2fde25eb5..7babebdfa5 100644 --- a/phpBB/includes/acp/acp_profile.php +++ b/phpBB/includes/acp/acp_profile.php @@ -138,6 +138,12 @@ class acp_profile foreach ($old_table_cols as $declaration) { $entities = preg_split('#\s+#', trim($declaration)); + + if ($entities[0] == 'PRIMARY') + { + continue; + } + if ($entities[0] !== 'pf_' . $field_ident) { $column_list[] = $entities[0]; @@ -1431,7 +1437,7 @@ class acp_profile foreach ($old_table_cols as $declaration) { $entities = preg_split('#\s+#', trim($declaration)); - if ($entities == 'PRIMARY') + if ($entities[0] == 'PRIMARY') { continue; } diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php index 1efd09c626..b8f3f2246b 100644 --- a/phpBB/includes/db/db_tools.php +++ b/phpBB/includes/db/db_tools.php @@ -962,7 +962,7 @@ class phpbb_db_tools foreach ($old_table_cols as $declaration) { $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name') + if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name) { continue; } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index ef6f2338c5..bf2d3a1c70 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -2188,7 +2188,7 @@ function sql_column_remove($dbms, $table_name, $column_name) foreach ($old_table_cols as $declaration) { $entities = preg_split('#\s+#', trim($declaration)); - if ($entities[0] == 'PRIMARY' || $entities[0] === '$column_name') + if ($entities[0] == 'PRIMARY' || $entities[0] === $column_name) { continue; } |