diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-03 22:07:34 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-12-03 22:07:34 -0500 |
| commit | bf6d501ab16f0557c0570faa2a6f45e588ff62fb (patch) | |
| tree | c23957f4de0b3db5976d1e4dac15c69ecfb317de /phpBB/install | |
| parent | 138f123bd81bdd25bde28ca46a9ebf1673ffaecd (diff) | |
| parent | baac9e5d150dab88ed6f1eca8ca61bc4468ab01c (diff) | |
| download | forums-bf6d501ab16f0557c0570faa2a6f45e588ff62fb.tar forums-bf6d501ab16f0557c0570faa2a6f45e588ff62fb.tar.gz forums-bf6d501ab16f0557c0570faa2a6f45e588ff62fb.tar.bz2 forums-bf6d501ab16f0557c0570faa2a6f45e588ff62fb.tar.xz forums-bf6d501ab16f0557c0570faa2a6f45e588ff62fb.zip | |
Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
* Noxwizard/ticket/10349:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
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 8b073df44c..026fc0d404 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1178,14 +1178,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); @@ -1223,8 +1222,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) |