cvs: ZendEngine2(PHP_5_2) / zend_builtin_functions.c /tests 017.phpt php-src NEWS

felipe		Mon Jun 22 00:03:25 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src	NEWS 
    /ZendEngine2	zend_builtin_functions.c 
    /ZendEngine2/tests	017.phpt 
  Log:
  - Fixed bug #48629 (get_defined_constants() ignores categorize parameter)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1562&r2=1.2027.2.547.2.1563&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1562 php-src/NEWS:1.2027.2.547.2.1563
--- php-src/NEWS:1.2027.2.547.2.1562	Sun Jun 21 22:33:48 2009
+++ php-src/NEWS	Mon Jun 22 00:03:24 2009
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.2.11
+- Fixed bug #48629 (get_defined_constants() ignores categorize parameter).
+  (Felipe)
 - Fixed bug #48276 (date("Y") on big endian machines produces the
   wrong result). (Scott)
 
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.40&r2=1.277.2.12.2.41&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.40 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.41
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.40	Sat Jun 20 18:45:18 2009
+++ ZendEngine2/zend_builtin_functions.c	Mon Jun 22 00:03:24 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.40 2009/06/20 18:45:18 felipe Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.41 2009/06/22 00:03:24 felipe Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -1618,15 +1618,15 @@
    Return an array containing the names and values of all defined constants */
 ZEND_FUNCTION(get_defined_constants)
 {
-	int argc = ZEND_NUM_ARGS();
+	zend_bool categorize = 0;
 
-	if (argc != 0 && argc != 1) {
-		ZEND_WRONG_PARAM_COUNT();
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &categorize) == FAILURE) {
+		return;
 	}
 
 	array_init(return_value);
 
-	if (argc) {
+	if (categorize) {
 		HashPosition pos;
 		zend_constant *val;
 		int module_number;
http://cvs.php.net/viewvc.cgi/ZendEngine2/tests/017.phpt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: ZendEngine2/tests/017.phpt
diff -u ZendEngine2/tests/017.phpt:1.1.2.6 ZendEngine2/tests/017.phpt:1.1.2.7
--- ZendEngine2/tests/017.phpt:1.1.2.6	Wed Aug  8 06:42:10 2007
+++ ZendEngine2/tests/017.phpt	Mon Jun 22 00:03:24 2009
@@ -60,7 +60,7 @@
 Warning: get_loaded_extensions() expects at most 1 parameter, 2 given in %s on line %d
 NULL
 
-Warning: Wrong parameter count for get_defined_constants() in %s on line %d
+Warning: get_defined_constants() expects at most 1 parameter, 2 given in %s on line %d
 NULL
 string(5) "array"
 string(5) "array"



-- 
Zend Engine CVS Mailing List (http://cvs.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php