Use Common::mb_* proxies rather than direct mb_* access in case multi…

…byte is disabled
d19dotca · Dec 15, 2014 · d97d9a0 · d97d9a0
1 parent 6f5e4bc
commit d97d9a0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/core/Tracker/PageUrl.php b/core/Tracker/PageUrl.php
@@ -157,7 +157,7 @@ protected static function cleanupHostAndHashTag($parsedUrl, $idSite = false)
         }
 
         if (!empty($parsedUrl['host'])) {
-            $parsedUrl['host'] = mb_strtolower($parsedUrl['host'], 'UTF-8');
+            $parsedUrl['host'] = Common::mb_strtolower($parsedUrl['host'], 'UTF-8');
         }
 
         if (!empty($parsedUrl['fragment'])) {
@@ -219,7 +219,8 @@ protected static function reencodeParameterValue($value, $encoding)
     {
         if (is_string($value)) {
             $decoded = urldecode($value);
-            if (@mb_check_encoding($decoded, $encoding)) {
+            if (function_exists('mb_check_encoding')
+                && @mb_check_encoding($decoded, $encoding)) {
                 $value = urlencode(mb_convert_encoding($decoded, 'UTF-8', $encoding));
             }
         }

diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
@@ -422,7 +422,7 @@ public static function isHostKnownAliasHost($urlHost, $idSite)
 
     private static function toCanonicalHost($host)
     {
-        $hostLower = mb_strtolower($host, 'UTF-8');
+        $hostLower = Common::mb_strtolower($host, 'UTF-8');
         return str_replace('www.', '', $hostLower);
     }
 

diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts
diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking
diff --git a/plugins/Referrers/Columns/Base.php b/plugins/Referrers/Columns/Base.php
@@ -236,8 +236,8 @@ protected function detectReferrerDirectEntry()
         if (!empty($this->referrerHost)) {
             // is the referrer host the current host?
             if (isset($this->currentUrlParse['host'])) {
-                $currentHost = mb_strtolower($this->currentUrlParse['host'], 'UTF-8');
-                if ($currentHost == mb_strtolower($this->referrerHost, 'UTF-8')) {
+                $currentHost = Common::mb_strtolower($this->currentUrlParse['host'], 'UTF-8');
+                if ($currentHost == Common::mb_strtolower($this->referrerHost, 'UTF-8')) {
                     $this->typeReferrerAnalyzed = Common::REFERRER_TYPE_DIRECT_ENTRY;
                     return true;
                 }
@@ -426,4 +426,4 @@ protected function doesLastActionHaveSameReferrer(Visitor $visitor, $referrerTyp
     {
         return $visitor->getVisitorColumn('referer_type') == $referrerType;
     }
-}
+}
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI