3 files changed, 7 insertions, 7 deletions
diff --git a/modules/statistics/statistics.admin.inc b/modules/statistics/statistics.admin.inc
index f10d9ca7f..7295083e7 100644
--- a/modules/statistics/statistics.admin.inc
+++ b/modules/statistics/statistics.admin.inc
@@ -122,7 +122,7 @@ function statistics_top_referrers() {
 
   $rows = array();
   while ($referrer = db_fetch_object($result)) {
-    $rows[] = array($referrer->hits, _statistics_link($referrer->url), t('@time ago', array('@time' => format_interval($_SERVER['REQUEST_TIME'] - $referrer->last))));
+    $rows[] = array($referrer->hits, _statistics_link($referrer->url), t('@time ago', array('@time' => format_interval(REQUEST_TIME - $referrer->last))));
   }
 
   if (empty($rows)) {
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index e96c09808..cf5378a72 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -55,7 +55,7 @@ function statistics_exit() {
         'daycount' => 1,
         'totalcount' => 1,
         'nid' => arg(1),
-        'timestamp' => $_SERVER['REQUEST_TIME'],
+        'timestamp' => REQUEST_TIME,
       );
       db_merge('node_counter')
         ->fields($fields)
@@ -74,7 +74,7 @@ function statistics_exit() {
       'uid' => $user->uid,
       'sid' => session_id(),
       'timer' => timer_read('page'),
-      'timestamp' => $_SERVER['REQUEST_TIME'],
+      'timestamp' => REQUEST_TIME,
     ))->execute();
   }
 }
@@ -188,14 +188,14 @@ function statistics_user($op, &$edit, &$user) {
 function statistics_cron() {
   $statistics_timestamp = variable_get('statistics_day_timestamp', '');
 
-  if (($_SERVER['REQUEST_TIME'] - $statistics_timestamp) >= 86400) {
+  if ((REQUEST_TIME - $statistics_timestamp) >= 86400) {
     // Reset day counts.
     db_query('UPDATE {node_counter} SET daycount = 0');
-    variable_set('statistics_day_timestamp', $_SERVER['REQUEST_TIME']);
+    variable_set('statistics_day_timestamp', REQUEST_TIME);
   }
 
   // Clean up expired access logs.
-  db_query('DELETE FROM {accesslog} WHERE timestamp < %d', $_SERVER['REQUEST_TIME'] - variable_get('statistics_flush_accesslog_timer', 259200));
+  db_query('DELETE FROM {accesslog} WHERE timestamp < %d', REQUEST_TIME - variable_get('statistics_flush_accesslog_timer', 259200));
 }
 
 /**
diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test
index 549326411..508134372 100644
--- a/modules/statistics/statistics.test
+++ b/modules/statistics/statistics.test
@@ -23,7 +23,7 @@ class StatisticsBlockVisitorsTestCase extends DrupalWebTestCase {
     $this->blocking_user = $this->drupalCreateUser(array('block IP addresses', 'access statistics'));
 
     // Insert dummy access by anonymous user into access log.
-    db_query("INSERT INTO {accesslog} (title, path, url, hostname, uid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", 'test', 'node/1', 'http://example.com', '192.168.1.1', '0', '10', '10', $_SERVER['REQUEST_TIME']);
+    db_query("INSERT INTO {accesslog} (title, path, url, hostname, uid, sid, timer, timestamp) values('%s', '%s', '%s', '%s', %d, '%s', %d, %d)", 'test', 'node/1', 'http://example.com', '192.168.1.1', '0', '10', '10', REQUEST_TIME);
   }
 
   /**