From: Zeev Suraski <zeev@php.net>
Date: Sat, 24 Nov 2001 02:41:58 +0000 (+0000)
Subject: Save entries in $_SESSION even if register_globals is on
X-Git-Tag: ChangeLog~257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3ef7170b1d443dee96f1166ef910a8a4e0f84a6;p=php

Save entries in $_SESSION even if register_globals is on
---

diff --git a/ext/session/session.c b/ext/session/session.c
index 676ff51899..028226c530 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -566,11 +566,11 @@ static void php_session_save_current_state(TSRMLS_D)
 	ulong num_key;
 	HashPosition pos;
 	
-	if (!PG(register_globals)) {
-		if (!PS(http_session_vars)) {
-			return;
-		}
+	if (!PG(register_globals) && !PS(http_session_vars)) {
+		return;
+	}
 		
+	if (PS(http_session_vars)) {
 		for (zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(PS(http_session_vars)), &pos);
 				zend_hash_get_current_key_ex(Z_ARRVAL_P(PS(http_session_vars)), &variable, &variable_len, &num_key, 0, &pos) == HASH_KEY_IS_STRING;
 				zend_hash_move_forward_ex(Z_ARRVAL_P(PS(http_session_vars)),&pos)) {