mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 18:26:32 +02:00
Code Issues Releases Wiki Activity

Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus

Browse Source 
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
This commit is contained in:
Oleg Pudeyev
2012-07-07 16:43:28 -04:00
parent 3ecc43d48c 36a568fd56
commit a7da376004
4 changed files with 55 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/install/install_install.php
View File

@@ -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)