diff options
| author | Stefan Giehl <stefan@matomo.org> | 2021-08-11 02:53:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-11 02:53:35 +0300 |
| commit | 1156eb9a5f1deadb05613ae0ab982faab9b1f5a3 (patch) | |
| tree | 860d26b6de1a3d642ceeedce833d2c9c6fa8c95d /plugins/Referrers | |
| parent | 107a97b6cfd1982886183917e7eed95ca13efc14 (diff) | |
Fix a couple a possible warning in PHP 8.1 (#17869)
Diffstat (limited to 'plugins/Referrers')
| -rw-r--r-- | plugins/Referrers/Columns/Base.php | 6 | ||||
| -rw-r--r-- | plugins/Referrers/SearchEngine.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php index 838e1138a7..1a86d8f6a0 100644 --- a/plugins/Referrers/Columns/Base.php +++ b/plugins/Referrers/Columns/Base.php @@ -310,7 +310,7 @@ abstract class Base extends VisitDimension protected function detectCampaignFromString($string) { foreach ($this->campaignNames as $campaignNameParameter) { - $campaignName = trim(urldecode(UrlHelper::getParameterFromQueryString($string, $campaignNameParameter))); + $campaignName = trim(urldecode(UrlHelper::getParameterFromQueryString($string, $campaignNameParameter) ?? '')); if (!empty($campaignName)) { break; } @@ -496,7 +496,7 @@ abstract class Base extends VisitDimension $referrerNameAnalayzed = mb_strtolower($this->nameReferrerAnalyzed); $referrerNameAnalayzed = $this->truncateReferrerName($referrerNameAnalayzed); - $isCurrentVisitACampaignWithSameName = mb_strtolower($visitor->getVisitorColumn('referer_name')) == $referrerNameAnalayzed; + $isCurrentVisitACampaignWithSameName = mb_strtolower($visitor->getVisitorColumn('referer_name') ?? '') == $referrerNameAnalayzed; $isCurrentVisitACampaignWithSameName = $isCurrentVisitACampaignWithSameName && $visitor->getVisitorColumn('referer_type') == Common::REFERRER_TYPE_CAMPAIGN; // if we detected a campaign but there is still no keyword set, we set the keyword to the Referrer host @@ -632,7 +632,7 @@ abstract class Base extends VisitDimension protected function hasReferrerColumnChanged(Visitor $visitor, $information, $infoName) { - $existing = mb_strtolower($visitor->getVisitorColumn($infoName)); + $existing = mb_strtolower($visitor->getVisitorColumn($infoName) ?? ''); $new = mb_strtolower($information[$infoName]); $result = $existing != $new; diff --git a/plugins/Referrers/SearchEngine.php b/plugins/Referrers/SearchEngine.php index 8b94d02855..e947a6795f 100644 --- a/plugins/Referrers/SearchEngine.php +++ b/plugins/Referrers/SearchEngine.php @@ -265,7 +265,7 @@ class SearchEngine extends Singleton } } else { // search for keywords now &vname=keyword - $key = UrlHelper::getParameterFromQueryString($query, $variableName); + $key = UrlHelper::getParameterFromQueryString($query, $variableName) ?? ''; $key = trim(urldecode($key)); // Special cases: empty keywords |