1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 13:00:26 +02:00

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
This commit is contained in:
Oleg Pudeyev
2012-07-07 16:43:30 -04:00
4 changed files with 55 additions and 8 deletions

View File

@@ -2291,6 +2291,21 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
return;
}
/**
* 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