diff options
author | Stefan Giehl <stefan@piwik.org> | 2018-10-11 02:00:43 +0300 |
---|---|---|
committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-10-11 02:00:43 +0300 |
commit | eb965d4ff002943ce926c99267511af55dee10cf (patch) | |
tree | 61e3f6607e9f4e4c97621e9220771251f3a3491e /plugins/UserCountryMap | |
parent | 8c07b4d61e662c77f1eb249d22256c5fa98ab496 (diff) |
Implements wrapper method for a more secure unserialize with PHP 7 (#13285)
* Implements wrapper method for a more secure unserialize
* run AllTests on PHP 7
* trigger a debug message if unserialize fails on PHP 7 + tests
* Add string to deserialize to debug log.
Diffstat (limited to 'plugins/UserCountryMap')
-rw-r--r-- | plugins/UserCountryMap/Controller.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UserCountryMap/Controller.php b/plugins/UserCountryMap/Controller.php index c78aa3f971..c41ae83e66 100644 --- a/plugins/UserCountryMap/Controller.php +++ b/plugins/UserCountryMap/Controller.php @@ -75,7 +75,7 @@ class Controller extends \Piwik\Plugin\Controller . '&filter_limit=-1' ); $config = array(); - $config['visitsSummary'] = unserialize($request->process()); + $config['visitsSummary'] = Common::safe_unserialize($request->process()); $config['countryDataUrl'] = $this->_report('UserCountry', 'getCountry', $this->idSite, $period, $date, $token_auth, false, $segment); $config['regionDataUrl'] = $this->_report('UserCountry', 'getRegion', @@ -277,7 +277,7 @@ class Controller extends \Piwik\Plugin\Controller . '&token_auth=' . $token_auth . '&filter_limit=-1' ); - $metaData = unserialize($request->process()); + $metaData = Common::safe_unserialize($request->process()); $metrics = array(); if (!empty($metaData[0]['metrics']) && is_array($metaData[0]['metrics'])) { |