fix #9306 try to handle a urldecoded segment first when formatting a segment

2 files changed, 13 insertions, 2 deletions

diff --git a/plugins/SegmentEditor/SegmentFormatter.php b/plugins/SegmentEditor/SegmentFormatter.php
index 54dcc20c99..19838d46d5 100644
--- a/plugins/SegmentEditor/SegmentFormatter.php
+++ b/plugins/SegmentEditor/SegmentFormatter.php
@@ -59,8 +59,13 @@ class SegmentFormatter
             return Piwik::translate('SegmentEditor_DefaultAllVisits');
         }
 
-        $segment = new SegmentExpression($segmentString);
-        $expressions = $segment->parseSubExpressions();
+        try {
+            $segment = new SegmentExpression(urldecode($segmentString));
+            $expressions = $segment->parseSubExpressions();
+        } catch (Exception $e) {
+            $segment = new SegmentExpression($segmentString);
+            $expressions = $segment->parseSubExpressions();
+        }
 
         $readable = '';
         foreach ($expressions as $expression) {
diff --git a/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php b/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
index bc0f206784..ca37e0775b 100644
--- a/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
+++ b/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
@@ -88,6 +88,12 @@ class SegmentFormatterTest extends IntegrationTestCase
         $this->assertSame('Browser version is not null nor empty', $readable);
     }
 
+    public function test_getHumanReadable_ShouldHandleAUrlDecodedSegment()
+    {
+        $readable = $this->formatter->getHumanReadable($segment = 'pageUrl%3D%40piwik%2CvisitId!%3D1', $this->idSite);
+        $this->assertSame('Page URL contains "piwik" or Visit ID is not "1"', $readable);
+    }
+
     /**
      * @expectedException \Exception
      * @expectedExceptionMessage The segment 'noTexisTinG' does not exist