diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:43:28 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:43:28 -0400 |
| commit | a7da3760048be7aff726fa2c652165e3b4807f13 (patch) | |
| tree | c23fa0111899d4b61599aeac20cda8cd481075e3 /phpBB/install | |
| parent | 3ecc43d48cb0f58eb667da6ad2b4e0b56bbb336b (diff) | |
| parent | 36a568fd567d2cf18d6815d6e12785f08b222c57 (diff) | |
| download | forums-a7da3760048be7aff726fa2c652165e3b4807f13.tar forums-a7da3760048be7aff726fa2c652165e3b4807f13.tar.gz forums-a7da3760048be7aff726fa2c652165e3b4807f13.tar.bz2 forums-a7da3760048be7aff726fa2c652165e3b4807f13.tar.xz forums-a7da3760048be7aff726fa2c652165e3b4807f13.zip | |
Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php index 8e3fe0387c..f1003b07d7 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1164,7 +1164,7 @@ class install_install extends module $sql_query = preg_replace('#phpbb_#i', $data['table_prefix'], $sql_query); - $sql_query = remove_comments($sql_query); + $sql_query = phpbb_remove_comments($sql_query); $sql_query = split_sql_file($sql_query, $delimiter); @@ -1202,7 +1202,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); - $sql_query = remove_comments($sql_query); + $sql_query = phpbb_remove_comments($sql_query); $sql_query = split_sql_file($sql_query, ';'); foreach ($sql_query as $sql) |