diff options
author | Matthieu Aubry <matt@piwik.org> | 2015-12-04 01:42:20 +0300 |
---|---|---|
committer | Matthieu Aubry <matt@piwik.org> | 2015-12-04 01:42:20 +0300 |
commit | 0dc59b92b248615bf54863d12c42e7544cc512da (patch) | |
tree | 6e61499d7b04b201ee4a97dd653e9953375ed5a5 | |
parent | c641b35286c082de152b0ba13d09e1326d97d1b9 (diff) | |
parent | d583954f3672a117c3b7655dcba93e781eaa55ee (diff) |
Merge pull request #9241 from piwik/8393
fixes single quote bug in rowevolution
5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/CoreHome/DataTableRowAction/RowEvolution.php b/plugins/CoreHome/DataTableRowAction/RowEvolution.php index d73c5c2158..106685edf7 100644 --- a/plugins/CoreHome/DataTableRowAction/RowEvolution.php +++ b/plugins/CoreHome/DataTableRowAction/RowEvolution.php @@ -91,7 +91,7 @@ class RowEvolution if (!is_array($this->label)) { throw new Exception("Expected label to be an array, got instead: " . $this->label); } - $this->label = $this->label[0]; + $this->label = Common::unsanitizeInputValue($this->label[0]); if ($this->label === '') throw new Exception("Parameter label not set."); diff --git a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php index 8983d1eea5..d2740b8aba 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php +++ b/tests/PHPUnit/Fixtures/TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers.php @@ -23,7 +23,7 @@ class TwoSitesManyVisitsOverSeveralDaysWithSearchEngineReferrers extends Fixture public $keywords = array( 'free > proprietary', // testing a keyword containing > 'peace "," not war', // testing a keyword containing , - 'justice )(&^#%$ NOT corruption!', + 'justice )(&^#%$ NOT \'" corruption!', ); public function setUp() diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index 7295efb518..3b8bde9065 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -249,7 +249,7 @@ <change>-100%</change> </nb_visits_1> <nb_visits_2> - <name>Google - justice )(&^#%$ not corruption! (Visits)</name> + <name>Google - justice )(&^#%$ not &#039;" corruption! (Visits)</name> <min>0</min> <max>1</max> </nb_visits_2> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index e1f0382dda..d97e75695c 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -14,7 +14,7 @@ <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> <row> - <label>Google - justice )(&^#%$ not corruption!</label> + <label>Google - justice )(&^#%$ not &#039;" corruption!</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> <max_actions>1</max_actions> @@ -23,7 +23,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+corruption%21</url> + <url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+%27%22+corruption%21</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> <row> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml index ff4f69a79d..5730859763 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml @@ -33,7 +33,7 @@ <change>-100%</change> </nb_visits_0> <nb_visits_1> - <name>justice )(&^#%$ not corruption! (Visits)</name> + <name>justice )(&^#%$ not &#039;" corruption! (Visits)</name> <min>0</min> <max>8</max> <change>-100%</change> |