diff options
| author | Kate Butler <kate@innocraft.com> | 2019-10-07 04:10:35 +0300 |
|---|---|---|
| committer | Thomas Steur <tsteur@users.noreply.github.com> | 2019-10-07 04:10:35 +0300 |
| commit | 1623e04208802be07010a4926a604baef23d23ae (patch) | |
| tree | d9e539dad0ce1aa8c5ac170e16568cd5c1e0e28a /plugins/SegmentEditor | |
| parent | 1bf1b1f84e5f913775d35cc6c4f21f5cad6237d0 (diff) | |
Remove duplicate decodeURIComponent call in segmentcontroller (#14952)
* Remove duplicate decodeURIComponent call
* Attempt double URI decoding so that we correctly handle segments that are stored double-encoded
Diffstat (limited to 'plugins/SegmentEditor')
| -rw-r--r-- | plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.controller.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.controller.js b/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.controller.js index 3ebfbfb923..967cd12a52 100644 --- a/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.controller.js +++ b/plugins/SegmentEditor/angularjs/segment-generator/segmentgenerator.controller.js @@ -47,7 +47,13 @@ } } - newMetric.value = decodeURIComponent(newMetric.value); + try { + // Decode again to deal with double-encoded segments in database + newMetric.value = decodeURIComponent(newMetric.value); + } catch (e) { + // Expected if the segment was not double-encoded + } + return newMetric; }; |