aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-08-21 15:21:25 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-08-21 15:21:25 +0200
commit4bc09cd34db4b103693c2188c79067c10b7e0b15 (patch)
treede1a34d35f711400cf6b05705611ba8d8df9d2cf /phpBB/includes/functions_user.php
parent8ad58645fe87a77cbc79f25ef2aff7a3785d24eb (diff)
parentac11806bf449b1ca1b69eae023b5ec318a10547d (diff)
downloadforums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.gz
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.bz2
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.xz
forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.zip
Merge remote-tracking branch 'bantu/ticket/10329' into develop
* bantu/ticket/10329: [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 124aac18be..930cd4625f 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1477,7 +1477,7 @@ function validate_username($username, $allowed_username = false)
$mbstring = $pcre = false;
// generic UTF-8 character types supported?
- if (pcre_utf8_support())
+ if (phpbb_pcre_utf8_support())
{
$pcre = true;
}
@@ -1614,7 +1614,7 @@ function validate_password($password)
$pcre = $mbstring = false;
// generic UTF-8 character types supported?
- if (pcre_utf8_support())
+ if (phpbb_pcre_utf8_support())
{
$upp = '\p{Lu}';
$low = '\p{Ll}';