diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-08-02 16:13:03 -0400 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-08-02 16:13:03 -0400 |
| commit | d24f31c65e31f00c3b2f1e1f44248dd20ed49cd7 (patch) | |
| tree | 96eabcb454904d4c2a6c82c8a4c9804140c89978 /ext | |
| parent | 9ca79106615824fff1d3f97a1fd7dc9e2d051fb6 (diff) | |
| parent | d60e168a7a73b1bd311754943856c1598d1cd9dc (diff) | |
| download | php-git-d24f31c65e31f00c3b2f1e1f44248dd20ed49cd7.tar.gz | |
Merge commit 'd60e168' into PHP-5.5
* commit 'd60e168':
pcre_quote? No such thing. How did this ever pass?
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt index 9674e85f5e..74b4a73584 100644 --- a/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt +++ b/ext/pdo_mysql/tests/pdo_mysql_phpinfo.phpt @@ -18,7 +18,7 @@ $db = MySQLPDOTest::factory(); ob_end_clean(); /* PDO Driver for MySQL, client library version => 6.0.3-alpha */ - $reg = 'Client API version.*' . pcre_quote($db->getAttribute(PDO::ATTR_CLIENT_VERSION), '/'); + $reg = 'Client API version.*' . preg_quote($db->getAttribute(PDO::ATTR_CLIENT_VERSION), '/'); if (!preg_match("/$reg/", $tmp)) { printf("[001] Cannot find MySQL PDO driver line in phpinfo() output\n"); |