diff options
author | piwikjapan <yamachan@piwikjapan.org> | 2015-11-23 18:06:00 +0300 |
---|---|---|
committer | piwikjapan <yamachan@piwikjapan.org> | 2015-11-23 18:06:00 +0300 |
commit | bae150b29b4af564feda62b7f534ec90822821f6 (patch) | |
tree | a5f4a80113a0a31f14eb8784500d666db9431e09 | |
parent | 2133f06de4fb26584301ed4841c24b89a1ec18ea (diff) | |
parent | ee42536390cd4c2a0dabad3fe49454f7a8494d47 (diff) |
Merge pull request #3 from piwikjapan/bugfix
Re-use the Common::mb_substr method.
-rw-r--r-- | plugins/Referrers/Columns/Keyword.php | 7 | ||||
-rw-r--r-- | plugins/Referrers/Columns/ReferrerName.php | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/plugins/Referrers/Columns/Keyword.php b/plugins/Referrers/Columns/Keyword.php index 48e8a9efd4..b3bfc374b1 100644 --- a/plugins/Referrers/Columns/Keyword.php +++ b/plugins/Referrers/Columns/Keyword.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\Referrers\Columns; +use Piwik\Common; use Piwik\Piwik; use Piwik\Plugins\Referrers\Segment; use Piwik\Tracker\Request; @@ -44,11 +45,7 @@ class Keyword extends Base $information = $this->getReferrerInformationFromRequest($request); if (!empty($information['referer_keyword'])) { - if (function_exists('mb_substr')) { - return mb_substr($information['referer_keyword'], 0, 255, 'UTF-8'); - } else { - return substr($information['referer_keyword'], 0, 255); - } + return Common::mb_substr($information['referer_keyword'], 0, 255); } return $information['referer_keyword']; diff --git a/plugins/Referrers/Columns/ReferrerName.php b/plugins/Referrers/Columns/ReferrerName.php index 9f3d122bdf..ded0a48f9e 100644 --- a/plugins/Referrers/Columns/ReferrerName.php +++ b/plugins/Referrers/Columns/ReferrerName.php @@ -8,6 +8,7 @@ */ namespace Piwik\Plugins\Referrers\Columns; +use Piwik\Common; use Piwik\Plugins\Referrers\Segment; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -38,11 +39,7 @@ class ReferrerName extends Base $information = $this->getReferrerInformationFromRequest($request); if (!empty($information['referer_name'])) { - if (function_exists('mb_substr')) { - return mb_substr($information['referer_name'], 0, 70, 'UTF-8'); - } else { - return substr($information['referer_name'], 0, 70); - } + return Common::mb_substr($information['referer_name'], 0, 70); } return $information['referer_name']; } |