diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 15:46:58 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-14 15:46:58 +0100 |
| commit | 34ed1352a63ece56185410385a81d881beb25731 (patch) | |
| tree | 7e555a2c19dadaf62a87ecc41f3a513628d90caf /phpBB/includes/functions.php | |
| parent | b21e343b5e80f2c6404fd94ff2a10c3a31d360e0 (diff) | |
| parent | f31da015fcad1efb792e78462af7eb56e1abcabc (diff) | |
| download | forums-34ed1352a63ece56185410385a81d881beb25731.tar forums-34ed1352a63ece56185410385a81d881beb25731.tar.gz forums-34ed1352a63ece56185410385a81d881beb25731.tar.bz2 forums-34ed1352a63ece56185410385a81d881beb25731.tar.xz forums-34ed1352a63ece56185410385a81d881beb25731.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9066] Move regex into get_preg_expression function and add tests
[ticket/9066] Disallow some database prefix to prevent same errors and problems
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 688bd9dad5..49574d66ce 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3256,6 +3256,10 @@ function get_preg_expression($mode) $inline = ($mode == 'relative_url') ? ')' : ''; return "(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*(?:/(?:[a-z0-9\-._~!$&'($inline*+,;=:@|]+|%[\dA-F]{2})*)*(?:\?(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?(?:\#(?:[a-z0-9\-._~!$&'($inline*+,;=:@/?|]+|%[\dA-F]{2})*)?"; break; + + case 'table_prefix': + return '#^[a-zA-Z][a-zA-Z0-9_]*$#'; + break; } return ''; |