diff options
| author | foobar <sniper@php.net> | 2006-04-10 15:09:15 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2006-04-10 15:09:15 +0000 |
| commit | 6af3218f810bda730645762ca386787452aa0a36 (patch) | |
| tree | 6e8c6dedc9443a2634244a6fc32294641bab5029 /main/php_variables.c | |
| parent | 672266c735aec36f18d0b8b828e6179b46bd7eb6 (diff) | |
| download | php-git-6af3218f810bda730645762ca386787452aa0a36.tar.gz | |
more cleanup (lingering ini settings which do not exist anymore, etc.)
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 94a2be9228..50981b61b4 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -772,7 +772,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) ) { (*src_entry)->refcount++; if (key_type == HASH_KEY_IS_STRING) { - /* if register_globals is on and working with main symbol table, prevent overwriting of GLOBALS */ + /* prevent overwriting of GLOBALS */ if (string_key_len != sizeof("GLOBALS") || memcmp(string_key.s, "GLOBALS", sizeof("GLOBALS") - 1)) { zend_u_hash_update(dest, key_type, string_key, string_key_len, src_entry, sizeof(zval *), NULL); } else { |