cvs: ZendEngine2(PHP_5_3) / zend_builtin_functions.c

iliaa		Tue Mar  3 23:42:51 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /ZendEngine2	zend_builtin_functions.c 
  Log:
  
  Fixed bug #47549 (get_defined_constants() return array with broken
  array categories)
  
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_builtin_functions.c?r1=1.277.2.12.2.25.2.44&r2=1.277.2.12.2.25.2.45&diff_format=u
Index: ZendEngine2/zend_builtin_functions.c
diff -u ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.44 ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.45
--- ZendEngine2/zend_builtin_functions.c:1.277.2.12.2.25.2.44	Sat Jan 10 19:15:39 2009
+++ ZendEngine2/zend_builtin_functions.c	Tue Mar  3 23:42:51 2009
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.44 2009/01/10 19:15:39 felipe Exp $ */
+/* $Id: zend_builtin_functions.c,v 1.277.2.12.2.25.2.45 2009/03/03 23:42:51 iliaa Exp $ */
 
 #include "zend.h"
 #include "zend_API.h"
@@ -1814,7 +1814,8 @@
 		module_names[0] = "internal";
 		zend_hash_internal_pointer_reset_ex(&module_registry, &pos);
 		while (zend_hash_get_current_data_ex(&module_registry, (void *) &module, &pos) != FAILURE) {
-			module_names[i++] = (char*)module->name;
+			module_names[module->module_number] = (char *)module->name;
+			i++;
 			zend_hash_move_forward_ex(&module_registry, &pos);
 		}
 		module_names[i] = "user";