aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-07-23 04:14:49 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-07-23 04:14:49 +0000
commite61e01a3b93a57139efc433d892e10dd66a32b71 (patch)
tree70328a6b9274e2a598a1239e7606f74cd079348a /phpBB/includes/search
parent092fb766419d72a61032a06ce7359ccfe5af29d1 (diff)
downloadforums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar
forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.gz
forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.bz2
forums-e61e01a3b93a57139efc433d892e10dd66a32b71.tar.xz
forums-e61e01a3b93a57139efc433d892e10dd66a32b71.zip
- a better way of checking PCRE property support
- fixed the naming of a variable or two git-svn-id: file:///svn/phpbb/trunk@7925 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/search')
-rw-r--r--phpBB/includes/search/fulltext_mysql.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php
index 760b0753f2..951ef5b69f 100644
--- a/phpBB/includes/search/fulltext_mysql.php
+++ b/phpBB/includes/search/fulltext_mysql.php
@@ -43,7 +43,11 @@ class fulltext_mysql extends search_backend
if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>=')))
{
- $this->pcre_properties = true;
+ // While this is the proper range of PHP versions, PHP may not be linked with the bundled PCRE lib and instead with an older version
+ if (@preg_match('/\p{L}/u', 'a') !== false)
+ {
+ $this->pcre_properties = true;
+ }
}
if (function_exists('mb_ereg'))