diff options
| author | BorisBerdichevski <borisba32@gmail.com> | 2014-06-15 14:15:42 -0500 |
|---|---|---|
| committer | Patrick Webster <noxwizard@phpbb.com> | 2014-06-15 14:15:42 -0500 |
| commit | 2dc389c936eb22fbb3e74b86c51501059fd5c1a6 (patch) | |
| tree | fc9e7838a114c3259f255a9a4dd6078b55a9c0a5 /phpBB/phpbb/db/tools.php | |
| parent | ad11925c7730e4f3c6b1cffe46c6ba531f04f4d9 (diff) | |
| download | forums-2dc389c936eb22fbb3e74b86c51501059fd5c1a6.tar forums-2dc389c936eb22fbb3e74b86c51501059fd5c1a6.tar.gz forums-2dc389c936eb22fbb3e74b86c51501059fd5c1a6.tar.bz2 forums-2dc389c936eb22fbb3e74b86c51501059fd5c1a6.tar.xz forums-2dc389c936eb22fbb3e74b86c51501059fd5c1a6.zip | |
[ticket/12643] Ensure that similarly named columns are not removed
PHPBB3-12643
Diffstat (limited to 'phpBB/phpbb/db/tools.php')
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 3d065ede8e..3b329b47bc 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -1996,7 +1996,7 @@ class tools $columns = implode(',', $column_list); - $new_table_cols = trim(preg_replace('/' . $column_name . '[^,]+(?:,|$)/m', '', $new_table_cols)); + $new_table_cols = trim(preg_replace('/' . $column_name . '\b[^,]+(?:,|$)/m', '', $new_table_cols)); if (substr($new_table_cols, -1) === ',') { // Remove the comma from the last entry again |