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:
authorMatthieu Napoli <matthieu@mnapoli.fr>2015-02-02 06:38:35 +0300
committerMatthieu Napoli <matthieu@mnapoli.fr>2015-02-02 06:38:35 +0300
commite9197cbd6e150822d0943ac096a1a6c6e2565938 (patch)
tree7021e163d59e47ec836227dcedfcb393c4217ece /core/UrlHelper.php
parent03ea8fb3ec54285bdd63cdada015aa67aec1c6ee (diff)
Removed calls to deprecated Piwik\Common::getCountriesList
Diffstat (limited to 'core/UrlHelper.php')
-rw-r--r--core/UrlHelper.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/core/UrlHelper.php b/core/UrlHelper.php
index 5efba99996..4eedce07a9 100644
--- a/core/UrlHelper.php
+++ b/core/UrlHelper.php
@@ -8,6 +8,9 @@
*/
namespace Piwik;
+use Piwik\Container\StaticContainer;
+use Piwik\Intl\Data\Provider\RegionDataProvider;
+
/**
* Contains less commonly needed URL helper methods.
*
@@ -72,7 +75,9 @@ class UrlHelper
{
static $countries;
if (!isset($countries)) {
- $countries = implode('|', array_keys(Common::getCountriesList(true)));
+ /** @var RegionDataProvider $regionDataProvider */
+ $regionDataProvider = StaticContainer::get('Piwik\Intl\Data\Provider\RegionDataProvider');
+ $countries = implode('|', array_keys($regionDataProvider->getCountryList(true)));
}
return preg_replace(