Merge branch 'PHP-7.1'

* PHP-7.1:
  Folder marks
This commit is contained in:
Xinchen Hui 2016-08-02 20:08:25 +08:00
commit 1cd9b1a34e

View File

@ -3543,7 +3543,7 @@ zend_bool array_column_param_helper(zval *param,
}
/* }}} */
static inline zval *array_column_fetch_prop(zval *data, zval *name, zval *rv)
static inline zval *array_column_fetch_prop(zval *data, zval *name, zval *rv) /* {{{ */
{
zval *prop = NULL;
@ -3573,6 +3573,7 @@ static inline zval *array_column_fetch_prop(zval *data, zval *name, zval *rv)
return prop;
}
/* }}} */
/* {{{ proto array array_column(array input, mixed column_key[, mixed index_key])
Return the values from a single column in the input array, identified by the