From 6af3218f810bda730645762ca386787452aa0a36 Mon Sep 17 00:00:00 2001 From: foobar Date: Mon, 10 Apr 2006 15:09:15 +0000 Subject: more cleanup (lingering ini settings which do not exist anymore, etc.) --- main/php_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_variables.c') 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 { -- cgit v1.2.1