From: Felipe Pena <felipe@php.net>
Date: Wed, 7 Jan 2009 17:38:13 +0000 (+0000)
Subject: - Revert in this branch (attention++, thanks Hannes :D)
X-Git-Tag: php-5.2.9RC1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6324a1f35cf8de2b49e32a7529fdbd208e7c110a;p=php

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

diff --git a/NEWS b/NEWS
index 81a29e4ddf..a1b51b0278 100644
--- 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 5c7932e06b..8fce81088d 100644
--- 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);