pollita Thu Dec 5 16:20:47 2002 EDT
Modified files:
/php4/ext/standard basic_functions.c aggregation.c aggregation.h
Log:
Bug #20746. Renamed aggregation_info() to aggregate_info() per naming conventions
and created alias for BC.
Index: php4/ext/standard/basic_functions.c
diff -u php4/ext/standard/basic_functions.c:1.545
php4/ext/standard/basic_functions.c:1.546
--- php4/ext/standard/basic_functions.c:1.545 Mon Dec 2 01:43:54 2002
+++ php4/ext/standard/basic_functions.c Thu Dec 5 16:20:47 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.545 2002/12/02 06:43:54 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.546 2002/12/05 21:20:47 pollita Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -871,7 +871,8 @@
PHP_FE(aggregate_properties_by_regexp, first_arg_force_ref)
#endif
PHP_FE(deaggregate,
first_arg_force_ref)
- PHP_FE(aggregation_info, first_arg_force_ref)
+ PHP_FE(aggregate_info, first_arg_force_ref)
+ PHP_FALIAS(aggregation_info, aggregate_info,
+ first_arg_force_ref)
PHP_FE(output_add_rewrite_var,
NULL)
PHP_FE(output_reset_rewrite_vars,
NULL)
Index: php4/ext/standard/aggregation.c
diff -u php4/ext/standard/aggregation.c:1.11 php4/ext/standard/aggregation.c:1.12
--- php4/ext/standard/aggregation.c:1.11 Fri Aug 23 21:19:27 2002
+++ php4/ext/standard/aggregation.c Thu Dec 5 16:20:47 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.c,v 1.11 2002/08/24 01:19:27 helly Exp $ */
+/* $Id: aggregation.c,v 1.12 2002/12/05 21:20:47 pollita Exp $ */
#include "php.h"
#include "basic_functions.h"
@@ -536,7 +536,7 @@
/* {{{ proto array aggregation_info(object obj)
*/
-PHP_FUNCTION(aggregation_info)
+PHP_FUNCTION(aggregate_info)
{
zval *obj;
aggregation_info *aggr_info;
Index: php4/ext/standard/aggregation.h
diff -u php4/ext/standard/aggregation.h:1.2 php4/ext/standard/aggregation.h:1.3
--- php4/ext/standard/aggregation.h:1.2 Thu Feb 28 03:26:44 2002
+++ php4/ext/standard/aggregation.h Thu Dec 5 16:20:47 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: aggregation.h,v 1.2 2002/02/28 08:26:44 sebastian Exp $ */
+/* $Id: aggregation.h,v 1.3 2002/12/05 21:20:47 pollita Exp $ */
#ifndef AGGREGATION_H
#define AGGREGATION_H
@@ -46,6 +46,6 @@
PHP_FUNCTION(aggregate_properties_by_regexp);
PHP_FUNCTION(aggregate);
PHP_FUNCTION(deaggregate);
-PHP_FUNCTION(aggregation_info);
+PHP_FUNCTION(aggregate_info);
#endif /* AGGREGATION_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
