diff --git a/modules/statistics/statistics.admin.inc b/modules/statistics/statistics.admin.inc index f1aff5c186a0cc97abddee40299a868332937da5..729d8b8c497d394f5d18e208fa2192d3d4aad5d2 100644 --- a/modules/statistics/statistics.admin.inc +++ b/modules/statistics/statistics.admin.inc @@ -192,7 +192,7 @@ function statistics_access_logging_settings() { '#default_value' => variable_get('statistics_enable_access_log', 0), '#options' => $options, '#description' => t('Log each page access. Required for referrer statistics.')); - $period = drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); + $period = array('0' => t('Never')) + drupal_map_assoc(array(3600, 10800, 21600, 32400, 43200, 86400, 172800, 259200, 604800, 1209600, 2419200, 4838400, 9676800), 'format_interval'); $form['access']['statistics_flush_accesslog_timer'] = array( '#type' => 'select', '#title' => t('Discard access logs older than'), diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index eb69d6578b0546b1a0115322582c37356a7a6afc..7ee1e139fe6739f415b755478ccb909580187f14 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -186,7 +186,9 @@ function statistics_cron() { } // Clean up expired access logs. - db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200)); + if (variable_get('statistics_flush_accesslog_timer', 259200) > 0) { + db_query('DELETE FROM {accesslog} WHERE timestamp < %d', time() - variable_get('statistics_flush_accesslog_timer', 259200)); + } } /**