- Patch #302763 by Dave Reid, Rob Loach: replace time() by ['REQUEST_TIME'] as per Rasmus' suggestion. Removed drupal_referrer() for consistency.

3 files changed, 8 insertions, 8 deletions

diff --git a/modules/statistics/statistics.admin.inc b/modules/statistics/statistics.admin.inc
index 891abe81e..f10d9ca7f 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(time() - $referrer->last))));
+    $rows[] = array($referrer->hits, _statistics_link($referrer->url), t('@time ago', array('@time' => format_interval($_SERVER['REQUEST_TIME'] - $referrer->last))));
   }
 
   if (empty($rows)) {
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 4242aec5b..32504dfde 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' => time(),
+        'timestamp' => $_SERVER['REQUEST_TIME'],
       );
       db_merge('node_counter')
         ->fields($fields)
@@ -69,12 +69,12 @@ function statistics_exit() {
     db_insert('accesslog')->fields(array(
       'title' => strip_tags(drupal_get_title()),
       'path' => $_GET['q'], 
-      'url' => referer_uri(), 
+      'url' => $_SERVER['HTTP_REFERER'], 
       'hostname' => ip_address(), 
       'uid' => $user->uid, 
       'sid' => session_id(), 
       'timer' => timer_read('page'), 
-      'timestamp' => time(),
+      'timestamp' => $_SERVER['REQUEST_TIME'],
     ))->execute();
   }
 }
@@ -188,14 +188,14 @@ function statistics_user($op, &$edit, &$user) {
 function statistics_cron() {
   $statistics_timestamp = variable_get('statistics_day_timestamp', '');
 
-  if ((time() - $statistics_timestamp) >= 86400) {
+  if (($_SERVER['REQUEST_TIME'] - $statistics_timestamp) >= 86400) {
     // Reset day counts.
     db_query('UPDATE {node_counter} SET daycount = 0');
-    variable_set('statistics_day_timestamp', time());
+    variable_set('statistics_day_timestamp', $_SERVER['REQUEST_TIME']);
   }
 
   // Clean up expired access logs.
-  db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200));
+  db_query('DELETE FROM {accesslog} WHERE timestamp < %d', $_SERVER['REQUEST_TIME'] - variable_get('statistics_flush_accesslog_timer', 259200));
 }
 
 /**
diff --git a/modules/statistics/statistics.test b/modules/statistics/statistics.test
index 5375d1f25..549326411 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', 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', $_SERVER['REQUEST_TIME']);
   }
 
   /**