diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-17 20:58:50 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-17 20:58:50 +0200 |
| commit | 2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5 (patch) | |
| tree | f9cc3e864f9f5442d2b6648f1b0082accd7d5386 /phpBB/includes/functions_admin.php | |
| parent | a4e699db494b408f9bcdd6fe685968acfb84ef44 (diff) | |
| parent | 8c733b3cd26d8487ff3b82a8c0510ca07b8e3945 (diff) | |
| download | forums-2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5.tar forums-2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5.tar.gz forums-2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5.tar.bz2 forums-2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5.tar.xz forums-2090ecfb8f5b53aad8d1b5a6e42e88a28e533ee5.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10969' into develop
* github-bantu/ticket/10969:
[ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
[ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 3ebd6682a9..5d19cd7adb 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2292,21 +2292,6 @@ 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 */ |