1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

Merge branch 'ticket/13073' into ticket/13073-develop

Conflicts:
	tests/controller/common_helper_route.php
This commit is contained in:
Marc Alexander
2014-09-19 18:48:24 +02:00
8 changed files with 236 additions and 18 deletions

View File

@@ -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 '';