iliaa Tue Apr 17 15:06:50 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_variables.c
Log:
Fixed bug #41093 (magic_quotes_gpc ignores first arrays keys).
http://cvs.php.net/viewvc.cgi/php-src/main/php_variables.c?r1=1.104.2.10.2.7&r2=1.104.2.10.2.8&diff_format=u
Index: php-src/main/php_variables.c
diff -u php-src/main/php_variables.c:1.104.2.10.2.7
php-src/main/php_variables.c:1.104.2.10.2.8
--- php-src/main/php_variables.c:1.104.2.10.2.7 Wed Mar 28 09:14:08 2007
+++ php-src/main/php_variables.c Tue Apr 17 15:06:50 2007
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_variables.c,v 1.104.2.10.2.7 2007/03/28 09:14:08 tony2001 Exp $ */
+/* $Id: php_variables.c,v 1.104.2.10.2.8 2007/04/17 15:06:50 iliaa Exp $ */
#include <stdio.h>
#include "php.h"
@@ -158,8 +158,7 @@
array_init(gpc_element);
zend_hash_next_index_insert(symtable1,
&gpc_element, sizeof(zval *), (void **) &gpc_element_p);
} else {
- if (PG(magic_quotes_gpc) && (index != var)) {
- /* no need to addslashes() the index if
it's the main variable name */
+ if (PG(magic_quotes_gpc)) {
escaped_index = php_addslashes(index,
index_len, &index_len, 0 TSRMLS_CC);
} else {
escaped_index = index;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
