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/includes/functions_admin.php | |
| 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/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 204fa9a43d..7352b3d1f3 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2294,6 +2294,21 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr } /** +* remove_comments will strip the sql comment lines out of an uploaded sql file +* specifically for mssql and postgres type files in the install.... +* +* @deprecated Use phpbb_remove_comments() instead. +*/ +function remove_comments(&$output) +{ + // Remove /* */ comments (http://ostermiller.org/findcomment.html) + $output = preg_replace('#/\*(.|[\r\n])*?\*/#', "\n", $output); + + // Return by reference and value. + return $output; +} + +/** * Cache moderators, called whenever permissions are changed via admin_permissions. Changes of username * and group names must be carried through for the moderators table */ |