diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-10 15:31:06 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-10 15:31:06 +0000 |
| commit | 1e49e9691707b55982053c5cc85119147460ff52 (patch) | |
| tree | d9ba284a3790c78b02f54301f31d910ad10b96fe /ext/pcre/php_pcre.c | |
| parent | 1119c4d2b210730e6c26f034e9769d116b26ceb1 (diff) | |
| parent | dbd02ad23bfbe0b0dc703c68774e397fc0a8b1ef (diff) | |
| download | php-git-1e49e9691707b55982053c5cc85119147460ff52.tar.gz | |
Merge branch 'master' into jsond
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 5701ae1a0c..d6f3823d3f 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -376,7 +376,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) #if HAVE_SETLOCALE if (BG(locale_string) && - (!BG(locale_string)->len != 1 || !BG(locale_string)->val[0] != 'C')) { + (BG(locale_string)->len != 1 || BG(locale_string)->val[0] != 'C')) { tables = pcre_maketables(); } #endif |