- RENAMED time_before_archive_considered_outdated in time_before_today_archive_considered_outdated

3 files changed, 3 insertions, 3 deletions

diff --git a/config/global.ini.php b/config/global.ini.php
index 5db6d8160e..8afdc24ef7 100755
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -43,7 +43,7 @@ enable_sql_profiler = 0
 ; Time in seconds after which an archive will be computed again. 
 ; This setting is used only for today's statistics.
 ; Defaults to 10 seconds so that by default, Piwik provides real time reporting.
-time_before_archive_considered_outdated = 10
+time_before_today_archive_considered_outdated = 10
 
 ; When loading piwik interface, we redirect the user to 'yesterday' statistics by default
 ; Possible values: yesterday, today, or any YYYY-MM-DD
diff --git a/core/ArchiveProcessing.php b/core/ArchiveProcessing.php
index 7bad89b1f2..3418447d10 100644
--- a/core/ArchiveProcessing.php
+++ b/core/ArchiveProcessing.php
@@ -246,7 +246,7 @@ abstract class Piwik_ArchiveProcessing
 			&& $this->period->toString() == date("Y-m-d")
 			)
 		{
-			$this->maxTimestampArchive = time() - Zend_Registry::get('config')->General->time_before_archive_considered_outdated;
+			$this->maxTimestampArchive = time() - Zend_Registry::get('config')->General->time_before_today_archive_considered_outdated;
 		}
 		// either
 		// - if the period we're looking for is finished, we look for a ts_archived that 
diff --git a/tests/core/ReleaseCheckList.test.php b/tests/core/ReleaseCheckList.test.php
index 106c65531f..e505ba229f 100644
--- a/tests/core/ReleaseCheckList.test.php
+++ b/tests/core/ReleaseCheckList.test.php
@@ -18,7 +18,7 @@ class Test_Piwik_ReleaseCheckList extends UnitTestCase
     	$this->checkEqual(array('Debug' => 'always_archive_data_day'), '0');
     	$this->checkEqual(array('Debug' => 'always_archive_data_period'), '0');
     	$this->checkEqual(array('Debug' => 'enable_sql_profiler'), '0');
-    	$this->checkEqual(array('General' => 'time_before_archive_considered_outdated'), '10');
+    	$this->checkEqual(array('General' => 'time_before_today_archive_considered_outdated'), '10');
     	$this->checkEqual(array('General' => 'enable_browser_archiving_triggering'), '1');
     	$this->checkEqual(array('General' => 'default_language'), 'en');
     	$this->checkEqual(array('Tracker' => 'record_statistics'), '1');