cvs: pear /PEAR pear.c
| From: | Stig Bakken | Date: | Sun, 18 Mar 2001 00:34:31 +0000 |
| Subject: | cvs: pear /PEAR pear.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-4631@lists.php.net to get a copy of this message | ||
ssb Sat Mar 17 16:34:31 2001 EDT
Modified files:
/pear/PEAR pear.c
Log:
* whoops, zend_is_callable suddenly got two more args
Index: pear/PEAR/pear.c
diff -u pear/PEAR/pear.c:1.4 pear/PEAR/pear.c:1.5
--- pear/PEAR/pear.c:1.4 Thu Mar 15 20:57:02 2001
+++ pear/PEAR/pear.c Sat Mar 17 16:34:30 2001
@@ -213,7 +213,7 @@
PHP_MINFO_FUNCTION(pear)
{
php_info_print_table_start();
- php_info_print_table_header(2, "PEAR", " $Revision: 1.4 $");
+ php_info_print_table_header(2, "PEAR", " $Revision: 1.5 $");
php_info_print_table_end();
/* DISPLAY_INI_ENTRIES(); */
@@ -422,7 +422,7 @@
#define FIND_DEFAULT(h,p,v) (zend_hash_find((h), (p), sizeof(p), (void **) &(v)) == SUCCESS
&& Z_TYPE_PP(v) != IS_NULL)
switch (Z_LVAL_PP(mode)) {
case PEAR_ERROR_CALLBACK:
- if ((Z_TYPE_PP(options) == IS_NULL || !zend_is_callable(*options)) &&
+ if ((Z_TYPE_PP(options) == IS_NULL || !zend_is_callable(*options, 0, NULL)) &&
!FIND_DEFAULT(this->value.obj.properties, "_default_error_callback",
options) &&
!FIND_DEFAULT(&EG(symbol_table), "_PEAR_default_error_callback",
options))
{
@@ -647,7 +647,7 @@
efree(tmpstr);
}
if (Z_LVAL_PP(mode) & PEAR_ERROR_CALLBACK) {
- if (zend_is_callable(*options)) {
+ if (zend_is_callable(*options, 1, NULL)) {
zval *retval, **args[1];
args[0] = &this;
if (call_user_function_ex(EG(function_table), NULL, *options, &retval, 1, args, 1,
NULL) == FAILURE) {