]> granicus.if.org Git - php/commitdiff
Fix duplicate NEWS entry
authorNikita Popov <nikita.ppv@gmail.com>
Sat, 16 Dec 2017 16:40:32 +0000 (17:40 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Sat, 16 Dec 2017 16:41:24 +0000 (17:41 +0100)
Also add an UPGRADING note while at it, as this is potentially
BC breaking.

[ci skip]

NEWS
UPGRADING

diff --git a/NEWS b/NEWS
index b495f747821ecbaa4f20bbdec25aca3ad4bf2cec..4a6447b89f5c4b245dd94942af735a09159106ce 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -111,10 +111,6 @@ PHP                                                                        NEWS
 - PDO SQLite
   . Add support for additional open flags
 
-- PCRE:
-  . Fixed bug #75355 (preg_quote() does not quote # control character).
-    (Majkl578)
-
 - phar:
   . Fixed bug #74991 (include_path has a 4096 char limit in some cases).
     (bwbroersma)
index 96c5583bec1397239dc5b55f845052d5d16aea20..695177e0c8015797ae43bc1405620e978f3843ed 100644 (file)
--- a/UPGRADING
+++ b/UPGRADING
@@ -77,6 +77,9 @@ Standard:
   . debug_zval_dump() was changed to display recursive arrays and objects
     in the same way as var_dump(). Now, it doesn't display them twice.
 
+PCRE:
+  . preg_quote() now also escapes the '#' character.
+
 ========================================
 6. New Functions
 ========================================