mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-16 13:26:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.6'

Browse Source
This commit is contained in:
Bob Weinand 2014-02-06 21:32:11 +01:00
commit 237c1bf7b5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_operators.c
View File

@ -1026,12 +1026,14 @@ ZEND_API int pow_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_POW);
if (Z_TYPE_P(op1) == IS_ARRAY) {
ZVAL_LONG(op1, 0);
ZVAL_LONG(result, 0);
return SUCCESS;
} else {
zendi_convert_scalar_to_number(op1, op1_copy, result);
}
if (Z_TYPE_P(op2) == IS_ARRAY) {
ZVAL_LONG(op2, 0);
ZVAL_LONG(result, 1L);
return SUCCESS;
} else {
zendi_convert_scalar_to_number(op2, op2_copy, result);
}

4
ext/standard/tests/math/pow_variation2.phpt
View File

@ -145,7 +145,7 @@ float(1)
float(1)
-- Iteration 19 --
float(1)
int(1)
-- Iteration 20 --
float(1)
@ -169,4 +169,4 @@ float(1)
-- Iteration 26 --
%s
===Done===
===Done===