diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-19 18:58:53 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-19 18:58:53 +0200 |
| commit | fc252f1ba52760a072d8e79f5afc3268db7d1035 (patch) | |
| tree | a2f4b15262c615d16ea398dd69ce16b6788c53f5 /phpBB/includes/functions.php | |
| parent | 98f02ece97cd92de6f71632247a439a1ba25a408 (diff) | |
| parent | 3418683cfcfd99235c680e28c60f066c3b36915a (diff) | |
| download | forums-fc252f1ba52760a072d8e79f5afc3268db7d1035.tar forums-fc252f1ba52760a072d8e79f5afc3268db7d1035.tar.gz forums-fc252f1ba52760a072d8e79f5afc3268db7d1035.tar.bz2 forums-fc252f1ba52760a072d8e79f5afc3268db7d1035.tar.xz forums-fc252f1ba52760a072d8e79f5afc3268db7d1035.zip | |
Merge pull request #2969 from marc1706/ticket/13073
[ticket/13073] Correctly generate routes from subfolders like /adm
* marc1706/ticket/13073:
[ticket/13073] Remove _test suffix from common test class
[ticket/13073] Switch $input with $expected and add paths with letters
[ticket/13073] Use abstract class for controller helper route tests
[ticket/13073] Add path regex to get_preg_expression() and add unit tests
[ticket/13073] Use just one regex in helper route()
[ticket/13073] Properly place comments in helper
[ticket/13073] Use correct class names in test files
[ticket/13073] Rework route tests and add tests for more directory types
[ticket/13073] Test that routes from subfolders like /adm work
[ticket/13073] Add tests for routes from adm pages
[ticket/13073] Add phpbb root path with mod rewrite enabled for proper routes
Diffstat (limited to 'phpBB/includes/functions.php')
| -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 ''; |