aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-04-29 00:34:24 -0400
committerOleg Pudeyev <oleg@bsdpower.com>2011-04-29 02:10:41 -0400
commit3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3 (patch)
treef0546132330272a9d13f299d2d2b562729812349
parente6eb11bb1168236cbaba0263d322170dc2c7bdcd (diff)
downloadforums-3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3.tar
forums-3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3.tar.gz
forums-3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3.tar.bz2
forums-3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3.tar.xz
forums-3cb1b90ca6afcf0533f8f398f2a3f4066b697ed3.zip
[ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
This change is somewhat questionable, maybe it should be reviewed. PHPBB3-10003
-rw-r--r--phpBB/includes/db/db_tools.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/db/db_tools.php b/phpBB/includes/db/db_tools.php
index f22ddc2ee8..d9ff811e34 100644
--- a/phpBB/includes/db/db_tools.php
+++ b/phpBB/includes/db/db_tools.php
@@ -681,10 +681,12 @@ class phpbb_db_tools
{
foreach ($columns as $column_name => $column_data)
{
- // Only add the column if it does not exist yet, else change it (to be consistent)
+ // Only add the column if it does not exist yet
if ($column_exists = $this->sql_column_exists($table, $column_name))
{
- $result = $this->sql_column_change($table, $column_name, $column_data, true);
+ continue;
+ // This is commented out here because it can take tremendous time on updates
+// $result = $this->sql_column_change($table, $column_name, $column_data, true);
}
else
{