revert my last change; chasing ghosts.

# the lesson is, ensure that php4 and php5 aren't loaded at the same time

diff --git a/main/php_variables.c b/main/php_variables.c
index c6bdbbff472517c563acff1a7fea7b826af82c30..b468c51df04ddf6122730daeee80076775f46b11 100644 (file)
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -625,9 +625,7 @@ int php_hash_environment(TSRMLS_D)
                        case 'p':
                        case 'P':
                                if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) {
-                                       if (sapi_module.treat_data) {
-                                               sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC);       /* POST Data */
-                                       }
+                                       sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC);       /* POST Data */
                                        _gpc_flags[0] = 1;
                                        if (PG(register_globals)) {
                                                php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_POST]) TSRMLS_CC);
@@ -637,9 +635,7 @@ int php_hash_environment(TSRMLS_D)
                        case 'c':
                        case 'C':
                                if (!_gpc_flags[1]) {
-                                       if (sapi_module.treat_data) {
-                                               sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC);     /* Cookie Data */
-                                       }
+                                       sapi_module.treat_data(PARSE_COOKIE, NULL, NULL TSRMLS_CC);     /* Cookie Data */
                                        _gpc_flags[1] = 1;
                                        if (PG(register_globals)) {
                                                php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_COOKIE]) TSRMLS_CC);
@@ -649,9 +645,7 @@ int php_hash_environment(TSRMLS_D)
                        case 'g':
                        case 'G':
                                if (!_gpc_flags[2]) {
-                                       if (sapi_module.treat_data) {
-                                               sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC);        /* GET Data */
-                                       }
+                                       sapi_module.treat_data(PARSE_GET, NULL, NULL TSRMLS_CC);        /* GET Data */
                                        _gpc_flags[2] = 1;
                                        if (PG(register_globals)) {
                                                php_autoglobal_merge(&EG(symbol_table), Z_ARRVAL_P(PG(http_globals)[TRACK_VARS_GET]) TSRMLS_CC);