Merge branch 'PHP-7.0'

laruence · laruence · commit 671987ce8358 · 2016-01-05T23:02:55.000+08:00
diff --git a/ext/interbase/ibase_blobs.c b/ext/interbase/ibase_blobs.c
@@ -296,7 +296,7 @@ PHP_FUNCTION(ibase_blob_add)
 
 	RESET_ERRMSG;
 
-	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &blob_arg, &string_arg)) {
+	if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &blob_arg, &string_arg)) {
 		return;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ PHP_FUNCTION(ibase_blob_add)`
`296`	`296`
`297`	`297`	`RESET_ERRMSG;`
`298`	`298`
`299`		`- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &blob_arg, &string_arg)) {`
	`299`	`+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "rz", &blob_arg, &string_arg)) {`
`300`	`300`	`return;`
`301`	`301`	`}`
`302`	`302`