diff options
| -rw-r--r-- | core/CronArchive.php | 2 | ||||
| -rw-r--r-- | core/Session.php | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/CronArchive.php b/core/CronArchive.php index 6cee48f94b..40866d2983 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -34,7 +34,7 @@ Arguments: --force-all-periods[=seconds] Limits archiving to websites with some traffic in the last [seconds] seconds. For example --force-all-periods=86400 will archive websites that had visits in the last 24 hours. - If [seconds] is not specified, all websites will visits in the last ". CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE + If [seconds] is not specified, all websites with visits in the last ". CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE . " seconds (" . round( CronArchive::ARCHIVE_SITES_WITH_TRAFFIC_SINCE/86400 ) ." days) will be archived. --force-timeout-for-periods=[seconds] The current week/ current month/ current year will be processed at most every [seconds]. diff --git a/core/Session.php b/core/Session.php index d4f14dc26f..871ae1650a 100644 --- a/core/Session.php +++ b/core/Session.php @@ -39,8 +39,7 @@ class Session extends Zend_Session */ public static function start($options = false) { - if (Common::isPhpCliMode() - || self::$sessionStarted + if (self::$sessionStarted || (defined('PIWIK_ENABLE_SESSION_START') && !PIWIK_ENABLE_SESSION_START) ) { return; |