Browse Source

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix typo in zend_symtable_add_new() API name
pull/2743/head
Sara Golemon 8 years ago
parent
commit
ff04db4420
  1. 2
      Zend/zend_builtin_functions.c
  2. 2
      Zend/zend_hash.h

2
Zend/zend_builtin_functions.c

@ -1176,7 +1176,7 @@ ZEND_FUNCTION(get_object_vars)
*/
zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value);
} else {
zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value);
zend_symtable_add_new(Z_ARRVAL_P(return_value), key, value);
}
} ZEND_HASH_FOREACH_END();
}

2
Zend/zend_hash.h

@ -346,7 +346,7 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons
Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF);
}
static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData)
static zend_always_inline zval *zend_symtable_add_new(HashTable *ht, zend_string *key, zval *pData)
{
zend_ulong idx;

Loading…
Cancel
Save