mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-05 15:16:16 +02:00
Code Issues Releases Wiki Activity

[ticket/12710] Pass the original column data to the create function

Browse Source 
PHPBB3-12710
This commit is contained in:
Joas Schilling 2014-08-09 14:13:42 +02:00
parent 37a1874782
commit ef9360d285
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/db/tools.php
View File

@ -2291,6 +2291,7 @@ class tools
*/ */
function sql_column_change($table_name, $column_name, $column_data, $inline = false) function sql_column_change($table_name, $column_name, $column_data, $inline = false)
{ {
$original_column_data = $column_data;
$column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data); $column_data = $this->sql_prepare_column_data($table_name, $column_name, $column_data);
$statements = array(); $statements = array();
@ -2379,7 +2380,7 @@ class tools
$temp_column_name = substr(md5($column_name), 0, 30); $temp_column_name = substr(md5($column_name), 0, 30);
// Add a temporary table with the new type // Add a temporary table with the new type
$result = $this->sql_column_add($table_name, $temp_column_name, $column_data); $result = $this->sql_column_add($table_name, $temp_column_name, $original_column_data);
$statements = array_merge($statements, $result); $statements = array_merge($statements, $result);
// Copy the data to the new column // Copy the data to the new column
@ -2390,7 +2391,7 @@ class tools
$statements = array_merge($statements, $result); $statements = array_merge($statements, $result);
// Recreate the original column with the new type // Recreate the original column with the new type
$result = $this->sql_column_add($table_name, $column_name, $column_data); $result = $this->sql_column_add($table_name, $column_name, $original_column_data);
$statements = array_merge($statements, $result); $statements = array_merge($statements, $result);
if (!empty($indexes)) if (!empty($indexes))