diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:43:30 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-07-07 16:43:30 -0400 |
| commit | b6a364b706a6d79b2d1a2854ea4fe2dba576dba2 (patch) | |
| tree | fe6b767b5ef9a11c0aaa9b1227a98acc93da6314 /phpBB/install/install_install.php | |
| parent | 1526886e3ec2b475bb7f578767f6430dbfa58097 (diff) | |
| parent | a7da3760048be7aff726fa2c652165e3b4807f13 (diff) | |
| download | forums-b6a364b706a6d79b2d1a2854ea4fe2dba576dba2.tar forums-b6a364b706a6d79b2d1a2854ea4fe2dba576dba2.tar.gz forums-b6a364b706a6d79b2d1a2854ea4fe2dba576dba2.tar.bz2 forums-b6a364b706a6d79b2d1a2854ea4fe2dba576dba2.tar.xz forums-b6a364b706a6d79b2d1a2854ea4fe2dba576dba2.zip | |
Merge PR #856 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
Diffstat (limited to 'phpBB/install/install_install.php')
| -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 ef384edb78..bbd11f9a6f 100644 --- a/phpBB/install/install_install.php +++ b/phpBB/install/install_install.php @@ -1178,7 +1178,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); @@ -1216,7 +1216,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) |