diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-02-07 01:19:10 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-07 01:19:10 +0300 |
commit | 40d169fe7c67993292f5e64498cd5b22d9fcc75f (patch) | |
tree | a61ee40372831067abf125bfc72c7d17aec54bb5 /plugins | |
parent | 76ac42c23dea9d098c24be1bade6f81c1dcd1a0f (diff) |
Reduce risk of segmentation fault in visit log (#15471)
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Contents/VisitorDetails.php | 2 | ||||
m--------- | plugins/CustomDimensions | 0 | ||||
-rw-r--r-- | plugins/Events/VisitorDetails.php | 1 | ||||
-rw-r--r-- | plugins/Live/VisitorDetails.php | 4 | ||||
m--------- | plugins/MarketingCampaignsReporting | 0 | ||||
-rw-r--r-- | plugins/Referrers/VisitorDetails.php | 1 |
6 files changed, 8 insertions, 0 deletions
diff --git a/plugins/Contents/VisitorDetails.php b/plugins/Contents/VisitorDetails.php index acf3363d38..110966f986 100644 --- a/plugins/Contents/VisitorDetails.php +++ b/plugins/Contents/VisitorDetails.php @@ -31,6 +31,7 @@ class VisitorDetails extends VisitorDetailsAbstract } $view = new View('@Contents/_actionContent.twig'); + $view->sendHeadersWhenRendering = false; $view->action = $action; $view->previousAction = $previousAction; $view->visitInfo = $visitorDetails; @@ -44,6 +45,7 @@ class VisitorDetails extends VisitorDetailsAbstract } $view = new View('@Contents/_actionTooltip'); + $view->sendHeadersWhenRendering = false; $view->action = $action; return [[ 10, $view->render() ]]; } diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 4df349ed91d001372311041ae0f6d593533ab56 +Subproject 16cda6608a317c283521b35bed014f8d1a2b22d diff --git a/plugins/Events/VisitorDetails.php b/plugins/Events/VisitorDetails.php index 7f9af081ef..5e58b3fc0c 100644 --- a/plugins/Events/VisitorDetails.php +++ b/plugins/Events/VisitorDetails.php @@ -65,6 +65,7 @@ class VisitorDetails extends VisitorDetailsAbstract } $view = new View('@Events/_actionEvent.twig'); + $view->sendHeadersWhenRendering = false; $view->action = $action; $view->previousAction = $previousAction; $view->visitInfo = $visitorDetails; diff --git a/plugins/Live/VisitorDetails.php b/plugins/Live/VisitorDetails.php index 37b3c71215..b6d51c0be7 100644 --- a/plugins/Live/VisitorDetails.php +++ b/plugins/Live/VisitorDetails.php @@ -96,6 +96,7 @@ class VisitorDetails extends VisitorDetailsAbstract $sitesModel = new \Piwik\Plugins\SitesManager\Model(); $view = new View($template); + $view->sendHeadersWhenRendering = false; $view->mainUrl = trim(Site::getMainUrlFor($this->getIdSite())); $view->additionalUrls = $sitesModel->getAliasSiteUrlsFromId($this->getIdSite()); $view->action = $action; @@ -107,6 +108,7 @@ class VisitorDetails extends VisitorDetailsAbstract public function renderActionTooltip($action, $visitInfo) { $view = new View('@Live/_actionTooltip'); + $view->sendHeadersWhenRendering = false; $view->action = $action; $view->visitInfo = $visitInfo; return [[ 0, $view->render() ]]; @@ -115,6 +117,7 @@ class VisitorDetails extends VisitorDetailsAbstract public function renderVisitorDetails($visitorDetails) { $view = new View('@Live/_visitorDetails.twig'); + $view->sendHeadersWhenRendering = false; $view->visitInfo = $visitorDetails; return [[ 0, $view->render() ]]; } @@ -122,6 +125,7 @@ class VisitorDetails extends VisitorDetailsAbstract public function renderIcons($visitorDetails) { $view = new View('@Live/_visitorLogIcons.twig'); + $view->sendHeadersWhenRendering = false; $view->visitor = $visitorDetails; return $view->render(); } diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject 6776c7061030e5fc7615292ca8e6363dba4d056 +Subproject 6c8d9a33be10675d3d46632a0d185f18053ebb9 diff --git a/plugins/Referrers/VisitorDetails.php b/plugins/Referrers/VisitorDetails.php index e413d5386d..b59c7b5802 100644 --- a/plugins/Referrers/VisitorDetails.php +++ b/plugins/Referrers/VisitorDetails.php @@ -32,6 +32,7 @@ class VisitorDetails extends VisitorDetailsAbstract public function renderVisitorDetails($visitorDetails) { $view = new View('@Referrers/_visitorDetails.twig'); + $view->sendHeadersWhenRendering = false; $view->visitInfo = $visitorDetails; return [[ 10, $view->render() ]]; } |