Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <tsteur@users.noreply.github.com>2016-04-19 03:17:53 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2016-04-19 03:17:53 +0300
commit030922c1d9e6eea83472d5819e7b88a0454d4f2d (patch)
tree71b0326f5d60f6768fe7daf086ccd729f81e9218 /plugins
parent7119a07d7e5bc6416c2f8eeb0823bbea5f840d18 (diff)
fix #4410 The string to escape is not a valid UTF-8 string (#10050)
Diffstat (limited to 'plugins')
-rw-r--r--plugins/SegmentEditor/SegmentFormatter.php3
-rw-r--r--plugins/SegmentEditor/SegmentSelectorControl.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/SegmentEditor/SegmentFormatter.php b/plugins/SegmentEditor/SegmentFormatter.php
index 19838d46d5..99052f5f4f 100644
--- a/plugins/SegmentEditor/SegmentFormatter.php
+++ b/plugins/SegmentEditor/SegmentFormatter.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\SegmentEditor;
use Exception;
+use Piwik\Common;
use Piwik\Config;
use Piwik\Db;
use Piwik\Piwik;
@@ -111,7 +112,7 @@ class SegmentFormatter
$translation = Piwik::translate($this->matchesMetric[$operator]);
}
- return strtolower($translation);
+ return Common::mb_strtolower($translation);
}
private function getFormattedValue($operand)
diff --git a/plugins/SegmentEditor/SegmentSelectorControl.php b/plugins/SegmentEditor/SegmentSelectorControl.php
index 72be071e5e..130b616d48 100644
--- a/plugins/SegmentEditor/SegmentSelectorControl.php
+++ b/plugins/SegmentEditor/SegmentSelectorControl.php
@@ -53,7 +53,7 @@ class SegmentSelectorControl extends UIControl
&& ($segment['type'] == 'metric' && $segment['segment'] != 'visitIp')
) {
$metricsLabel = Piwik::translate('General_Metrics');
- $metricsLabel[0] = strtolower($metricsLabel[0]);
+ $metricsLabel[0] = Common::mb_strtolower($metricsLabel[0]);
$segment['category'] .= ' (' . $metricsLabel . ')';
}
$segmentsByCategory[$segment['category']][] = $segment;