#302763 by DamZ: Fixing test failures, removing legacy globals check cruft.

includes/bootstrap.inc

@@ -302,16 +302,11 @@ function conf_path($require_settings = TRUE, $reset = FALSE) {
 }
 
 /**
- * Unsets all disallowed global variables. See $allowed for what's allowed.
- */
-function drupal_unset_globals() {
-  if (ini_get('register_globals')) {
-    $allowed = array('_ENV' => 1, '_GET' => 1, '_POST' => 1, '_COOKIE' => 1, '_FILES' => 1, '_SERVER' => 1, '_REQUEST' => 1, 'GLOBALS' => 1);
-    foreach ($GLOBALS as $key => $value) {
-      if (!isset($allowed[$key])) {
-        unset($GLOBALS[$key]);
-      }
-    }
+ * Initialize variables needed for the rest of the execution.
+ */
+function drupal_initialize_variables() {
+  if (!isset($_SERVER['HTTP_REFERER'])) {
+    $_SERVER['HTTP_REFERER'] = '';
   }
 }
 
@@ -993,7 +988,7 @@ function _drupal_bootstrap($phase) {
   switch ($phase) {
 
     case DRUPAL_BOOTSTRAP_CONFIGURATION:
-      drupal_unset_globals();
+      drupal_initialize_variables();
       // Start a page timer:
       timer_start('page');
       // Initialize the configuration

modules/simpletest/tests/session.test

@@ -113,7 +113,7 @@ class SessionTestCase extends DrupalWebTestCase {
     $this->assertEqual($authenticated, $this->session_count_authenticated, t('Correctly counted @count authenticated sessions.', array('@count' => $authenticated)), t('Session'));
 
     // Should return 0 sessions from 1 second from now.
-    $this->assertEqual(sess_count($_SERVER['REQUEST_TIME'] + 1), 0, t('Correctly returned 0 sessions newer than the current time.'), t('Session'));
+    $this->assertEqual(sess_count(time() + 1), 0, t('Correctly returned 0 sessions newer than the current time.'), t('Session'));
 
   }