- Revert in this branch (attention++, thanks Hannes :D)

diff --git a/NEWS b/NEWS
index 81a29e4ddf1a816c99ad478101304fbfa959a842..a1b51b027899f025b054c2f78b10eff71d5c2e42 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,6 @@ PHP                                                                        NEWS
   (Fixes CVE-2008-5498) (Scott)
 - Fixed a segfault when malformed string is passed to json_decode(). (Scott)
 
-- Fixed bug #47029 (quoted_printable_decode() produces duplicate warning).
-  (Andy wharmby)
 - Fixed bug #47027 (var_export doesn't show numeric indices on ArrayObject).
   (Derick)
 - Fixed bug #46985 (OVERWRITE and binary mode does not work, regression introduced in

diff --git a/ext/standard/quot_print.c b/ext/standard/quot_print.c
index 5c7932e06bd5d8ac2a30fcb886207703b5bd71b3..8fce81088d3f68c1fb20dbcc7a9751d98a92a3e6 100644 (file)
--- a/ext/standard/quot_print.c
+++ b/ext/standard/quot_print.c
@@ -156,7 +156,7 @@ PHP_FUNCTION(quoted_printable_decode)
        int i = 0, j = 0, k;
 
        if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg1) == FAILURE) {
-               return;
+               WRONG_PARAM_COUNT;
        }
        convert_to_string_ex(arg1);