archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Removed or simplified incorrect SEPARATE_*() macros usage.

Browse source
This commit is contained in:
Dmitry Stogov 2015-09-29 11:17:43 +03:00
parent 617bef558b
commit 560e4fa393
16 changed files with 13 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
main/php_variables.c
View file

@ -649,7 +649,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src)
zend_hash_index_update(dest, num_key, src_entry);
}
} else {
SEPARATE_ZVAL(dest_entry);
SEPARATE_ARRAY(dest_entry);
php_autoglobal_merge(Z_ARRVAL_P(dest_entry), Z_ARRVAL_P(src_entry));
}
} ZEND_HASH_FOREACH_END();