diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-01-07 10:51:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 10:51:56 +0300 |
| commit | b10d03eff7722394c36ad6f3542a400e0e34f719 (patch) | |
| tree | 8f59d79deb109cb92abda427d3acdec129273fe8 /plugins/Live/Visitor.php | |
| parent | 50b866dae9caf2e216cf228bbc37b16d30beb4d0 (diff) | |
| parent | c60ae9f325e6782a3988560e4f59fde165ebdd19 (diff) | |
Merge pull request #11154 from piwik/3.x-dev3.0.1-b3
Piwik 3.0.1-b3
Diffstat (limited to 'plugins/Live/Visitor.php')
| -rw-r--r-- | plugins/Live/Visitor.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index f50e495537..de54b7d9b3 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -124,7 +124,7 @@ class Visitor implements VisitorInterface /** * Removes fields that are not meant to be displayed (md5 config hash) - * Or that the user should only access if he is Super User or admin (cookie, IP) + * Or that the user should only access if they are Super User or admin (cookie, IP) * * @param array $visitorDetails * @return array @@ -158,7 +158,7 @@ class Visitor implements VisitorInterface // ==> also update API/API.php getSuggestedValuesForSegment(), the $segmentsNeedActionsInfo array // flatten visit custom variables - if (!empty($visitorDetailsArray['customVariables']) + if (!empty($visitorDetailsArray['customVariables']) && is_array($visitorDetailsArray['customVariables'])) { foreach ($visitorDetailsArray['customVariables'] as $thisCustomVar) { $visitorDetailsArray = array_merge($visitorDetailsArray, $thisCustomVar); |