aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-08-11 14:49:58 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-08-11 14:49:58 +0000
commit96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b (patch)
tree9721adf16a6ec509b76f86679113ae44074b878d /phpBB/install/database_update.php
parentff458a5b4e81c1f35a3341ad4646205e52c5b5da (diff)
downloadforums-96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b.tar
forums-96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b.tar.gz
forums-96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b.tar.bz2
forums-96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b.tar.xz
forums-96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b.zip
do not change column if column already exists.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9956 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 4380f0cb8c..8252cd4968 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1860,10 +1860,12 @@ class updater_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
{