diff options
Diffstat (limited to 'plugins/CoreHome/Columns/VisitorId.php')
| -rw-r--r-- | plugins/CoreHome/Columns/VisitorId.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/CoreHome/Columns/VisitorId.php b/plugins/CoreHome/Columns/VisitorId.php index 108c41b921..ff1596837b 100644 --- a/plugins/CoreHome/Columns/VisitorId.php +++ b/plugins/CoreHome/Columns/VisitorId.php @@ -1,4 +1,5 @@ <?php + /** * Matomo - free/libre analytics platform * @@ -13,8 +14,8 @@ use Piwik\Columns\MetricsList; use Piwik\Piwik; use Piwik\Plugin\ArchivedMetric; use Piwik\Plugin\Dimension\VisitDimension; +use Piwik\Plugins\Live\Live; use Piwik\Segment\SegmentsList; -use Piwik\Plugins\Live\SystemSettings; use Piwik\Columns\DimensionSegmentFactory; /** @@ -30,7 +31,7 @@ class VisitorId extends VisitDimension protected $segmentName = 'visitorId'; protected $acceptValues = '34c31e04394bdc63 - any 16 Hexadecimal chars ID, which can be fetched using the Tracking API function getVisitorId()'; protected $allowAnonymous = false; - protected $sqlFilterValue = array('Piwik\Common', 'convertVisitorIdToBin'); + protected $sqlFilterValue = ['Piwik\Common', 'convertVisitorIdToBin']; protected $type = self::TYPE_BINARY; public function configureMetrics(MetricsList $metricsList, DimensionMetricFactory $dimensionMetricFactory) @@ -44,9 +45,7 @@ class VisitorId extends VisitDimension public function configureSegments(SegmentsList $segmentsList, DimensionSegmentFactory $dimensionSegmentFactory) { try { - $systemSettings = new SystemSettings(); - $visitorProfileEnabled = $systemSettings->disableVisitorProfile->getValue() === false - && $systemSettings->disableVisitorLog->getValue() === false; + $visitorProfileEnabled = Live::isVisitorProfileEnabled(); } catch (\Zend_Db_Exception $e) { // when running tests the db might not yet be set up when fetching available segments if (!defined('PIWIK_TEST_MODE') || !PIWIK_TEST_MODE) { |