diff options
| -rw-r--r-- | ext/standard/assert.c | 17 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 1 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ext/standard/assert.c b/ext/standard/assert.c index 36f717085a..b88dbf80fb 100644 --- a/ext/standard/assert.c +++ b/ext/standard/assert.c @@ -114,16 +114,6 @@ PHP_MSHUTDOWN_FUNCTION(assert) return SUCCESS; } -PHP_RINIT_FUNCTION(assert) -{ - if (ASSERTG(cb)) { - MAKE_STD_ZVAL(ASSERTG(callback)); - ZVAL_STRING(ASSERTG(callback), ASSERTG(cb), 1); - } - - return SUCCESS; -} - PHP_RSHUTDOWN_FUNCTION(assert) { if (ASSERTG(callback)) { @@ -197,6 +187,11 @@ PHP_FUNCTION(assert) RETURN_TRUE; } + if (!ASSERTG(callback) && ASSERTG(cb)) { + MAKE_STD_ZVAL(ASSERTG(callback)); + ZVAL_STRING(ASSERTG(callback), ASSERTG(cb), 1); + } + if (ASSERTG(callback)) { zval *args[3]; zval *retval; @@ -293,6 +288,8 @@ PHP_FUNCTION(assert_options) case ASSERT_CALLBACK: if (ASSERTG(callback) != NULL) { RETVAL_ZVAL(ASSERTG(callback), 1, 0); + } else if (ASSERTG(cb)) { + RETVAL_STRING(ASSERTG(cb), 1); } else { RETVAL_NULL(); } diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index a79d49a8dc..0a0009d133 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -4132,7 +4132,6 @@ PHP_RINIT_FUNCTION(basic) #ifdef HAVE_SYSLOG_H PHP_RINIT(syslog)(INIT_FUNC_ARGS_PASSTHRU); #endif - PHP_RINIT(assert) (INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(dir)(INIT_FUNC_ARGS_PASSTHRU); PHP_RINIT(url_scanner_ex)(INIT_FUNC_ARGS_PASSTHRU); |