diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 18:48:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 18:48:24 +0200 |
| commit | 9bf58697dcc18881086d1bcc4565a6ae77b4dd17 (patch) | |
| tree | bc00d0e8aaef05925e229cb781b2475d3125f8f1 /phpBB/includes | |
| parent | 5091600a16eeee4dbd4c40ca1f051a9774887100 (diff) | |
| parent | 3418683cfcfd99235c680e28c60f066c3b36915a (diff) | |
| download | forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.gz forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.bz2 forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.xz forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.zip | |
Merge branch 'ticket/13073' into ticket/13073-develop
Conflicts:
tests/controller/common_helper_route.php
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index a61518401c..9e1e1cae0e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3317,6 +3317,11 @@ function get_preg_expression($mode) case 'table_prefix': return '#^[a-zA-Z][a-zA-Z0-9_]*$#'; break; + + // Matches the predecing dot + case 'path_remove_dot_trailing_slash': + return '#^(?:(\.)?)+(?:(.+)?)+(?:([\\/\\\])$)#'; + break; } return ''; |