diff options
| author | Patrick Webster <noxwizard@phpbb.com> | 2011-09-28 01:52:08 -0500 |
|---|---|---|
| committer | Patrick Webster <noxwizard@phpbb.com> | 2011-09-28 01:52:08 -0500 |
| commit | 26e84b12e817dd5e86a82c379a03a67f9f1bacd1 (patch) | |
| tree | f08bd0fbd7c50f9f153c72bc6d0df1bf706ba8a1 /phpBB/install | |
| parent | 4bc11db0ffc3b387e4ad38b0d9ceccfa58f2738d (diff) | |
| download | forums-26e84b12e817dd5e86a82c379a03a67f9f1bacd1.tar forums-26e84b12e817dd5e86a82c379a03a67f9f1bacd1.tar.gz forums-26e84b12e817dd5e86a82c379a03a67f9f1bacd1.tar.bz2 forums-26e84b12e817dd5e86a82c379a03a67f9f1bacd1.tar.xz forums-26e84b12e817dd5e86a82c379a03a67f9f1bacd1.zip | |
[ticket/10349] Use new schema comment function in installer
This is what now runs in the unit tests. The COMMENTS field in the dbms data
is no longer needed, so it has been removed.
PHPBB3-10349
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 9fe0c8aed5..9b37ee2be3 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1173,14 +1173,13 @@ class install_install extends module $dbms_schema = 'schemas/' . $available_dbms[$data['dbms']]['SCHEMA'] . '_schema.sql'; // How should we treat this schema? - $remove_remarks = $available_dbms[$data['dbms']]['COMMENTS']; $delimiter = $available_dbms[$data['dbms']]['DELIM']; $sql_query = @file_get_contents($dbms_schema); $sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query); - $remove_remarks($sql_query); + $sql_query = remove_comments($sql_query); $sql_query = split_sql_file($sql_query, $delimiter); @@ -1218,8 +1217,7 @@ class install_install extends module // Change language strings... $sql_query = preg_replace_callback('#\{L_([A-Z0-9\-_]*)\}#s', 'adjust_language_keys_callback', $sql_query); - // Since there is only one schema file we know the comment style and are able to remove it directly with remove_remarks - remove_remarks($sql_query); + $sql_query = remove_comments($sql_query); $sql_query = split_sql_file($sql_query, ';'); foreach ($sql_query as $sql) |