com php-src: Merge branch 'PHP-5.6': ext/spl/spl_array.c
| From: | Tjerk Anne Meesters | Date: | Sun, 18 May 2014 14:51:36 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/spl/spl_array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78443@lists.php.net to get a copy of this message | ||
Commit: 6aac353accfb205bf555d2edfb7255b42ee6fc73
Author: Tjerk Meesters <datibbaw@php.net> Sun, 18 May 2014 21:55:44 +0800
Parents: 886fafc34f046c1887ea97eed9faf256be1dc3eb d4295eb26a1264f6f760847f3fa1eddfbf890f7b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6aac353accfb205bf555d2edfb7255b42ee6fc73
Log:
Merge branch 'PHP-5.6'
Conflicts:
ext/spl/spl_array.c
Changed paths:
MM ext/spl/spl_array.c
Diff:
diff --cc ext/spl/spl_array.c
index 3e97e94,6ee67bf..1fe795c
--- a/ext/spl/spl_array.c
+++ b/ext/spl/spl_array.c
@@@ -601,9 -601,9 +601,9 @@@ static int spl_array_has_dimension_ex(i
zend_call_method_with_1_params(&object, Z_OBJCE_P(object), &intern->fptr_offset_has,
"offsetExists", &rv, offset_tmp);
zval_ptr_dtor(&offset_tmp);
- if (rv && zend_is_true(rv)) {
+ if (rv && zend_is_true(rv TSRMLS_CC)) {
zval_ptr_dtor(&rv);
- if (check_empty == 2) {
+ if (check_empty != 1) {
return 1;
} else if (intern->fptr_offset_get) {
value = spl_array_read_dimension_ex(1, object, offset, BP_VAR_R TSRMLS_CC);
@@@ -658,16 -660,7 +660,7 @@@
}
}
- switch (check_empty) {
- case 0:
- return Z_TYPE_P(value) != IS_NULL;
- case 2:
- return 1;
- case 1:
- return zend_is_true(value TSRMLS_CC);
- }
-
- return 0;
- return check_empty ? zend_is_true(value) : Z_TYPE_P(value) != IS_NULL;
++ return check_empty ? zend_is_true(value TSRMLS_CC) : Z_TYPE_P(value) != IS_NULL;
} /* }}} */
static int spl_array_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC) /* {{{
*/