From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sat, 16 Dec 2017 16:40:32 +0000 (+0100)
Subject: Fix duplicate NEWS entry
X-Git-Tag: php-7.3.0alpha1~784
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43d9f5995de7a365fcd53de135fdfa50deb90f7f;p=php

Fix duplicate NEWS entry

Also add an UPGRADING note while at it, as this is potentially
BC breaking.

[ci skip]
---

diff --git a/NEWS b/NEWS
index b495f74782..4a6447b89f 100644
--- 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)
diff --git a/UPGRADING b/UPGRADING
index 96c5583bec..695177e0c8 100644
--- 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
 ========================================