diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-12-31 04:24:17 +0300 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2015-01-09 00:13:31 +0300 |
| commit | 24bf8d160e2d6f7ef11fbb0a5598f41256849731 (patch) | |
| tree | aa1151b963c03df3c5bbb8bd18ffdaad745b45a7 /core/Intl | |
| parent | fae1741da720150affe4347ba660da0ff313422a (diff) | |
require instead of require_once because in PHPUnit global variables are reset
Diffstat (limited to 'core/Intl')
| -rw-r--r-- | core/Intl/Data/Provider/LanguageDataProvider.php | 4 | ||||
| -rw-r--r-- | core/Intl/Data/Provider/RegionDataProvider.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/Intl/Data/Provider/LanguageDataProvider.php b/core/Intl/Data/Provider/LanguageDataProvider.php index e9cf3b8026..44fcfab5d0 100644 --- a/core/Intl/Data/Provider/LanguageDataProvider.php +++ b/core/Intl/Data/Provider/LanguageDataProvider.php @@ -22,7 +22,7 @@ class LanguageDataProvider */ public static function getLanguageList() { - require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php'; + require PIWIK_INCLUDE_PATH . '/core/DataFiles/Languages.php'; return $GLOBALS['Piwik_LanguageList']; } @@ -36,7 +36,7 @@ class LanguageDataProvider */ public static function getLanguageToCountryList() { - require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/LanguageToCountry.php'; + require PIWIK_INCLUDE_PATH . '/core/DataFiles/LanguageToCountry.php'; return $GLOBALS['Piwik_LanguageToCountry']; } diff --git a/core/Intl/Data/Provider/RegionDataProvider.php b/core/Intl/Data/Provider/RegionDataProvider.php index b47aa4ab9c..a859ac80ba 100644 --- a/core/Intl/Data/Provider/RegionDataProvider.php +++ b/core/Intl/Data/Provider/RegionDataProvider.php @@ -21,7 +21,7 @@ class RegionDataProvider */ public function getContinentList() { - require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; + require PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; return $GLOBALS['Piwik_ContinentList']; } @@ -35,7 +35,7 @@ class RegionDataProvider */ public static function getCountryList($includeInternalCodes = false) { - require_once PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; + require PIWIK_INCLUDE_PATH . '/core/DataFiles/Countries.php'; $countriesList = $GLOBALS['Piwik_CountryList']; $extras = $GLOBALS['Piwik_CountryList_Extras']; |