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/includes/functions_admin.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/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 5d19cd7adb..3ebd6682a9 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2292,6 +2292,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 */ |