diff options
| author | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-02-10 11:14:15 +0300 |
|---|---|---|
| committer | vipsoft <vipsoft@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-02-10 11:14:15 +0300 |
| commit | e6d09093dbb197dbfd51e9803d5ee4a64372cac5 (patch) | |
| tree | 252bd657aa53e6fac4690cd8cd6bcd536472c135 /plugins/UserCountry | |
| parent | 45a7a1992f2232af36068e08a5deb1b1f43dff1e (diff) | |
fixes #1122 - per Matt's review
Diffstat (limited to 'plugins/UserCountry')
| -rw-r--r-- | plugins/UserCountry/API.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php index 12e075bf8c..3b83786e9a 100644 --- a/plugins/UserCountry/API.php +++ b/plugins/UserCountry/API.php @@ -37,9 +37,9 @@ class Piwik_UserCountry_API return self::$instance; } - static public function getCountry( $idSite, $period, $date ) + public function getCountry( $idSite, $period, $date ) { - $dataTable = self::getDataTable('UserCountry_country', $idSite, $period, $date); + $dataTable = $this->getDataTable('UserCountry_country', $idSite, $period, $date); // apply filter on the whole datatable in order the inline search to work (searches are done on "beautiful" label) $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getFlagFromCode')); @@ -49,15 +49,15 @@ class Piwik_UserCountry_API return $dataTable; } - static public function getContinent( $idSite, $period, $date ) + public function getContinent( $idSite, $period, $date ) { - $dataTable = self::getDataTable('UserCountry_continent', $idSite, $period, $date); + $dataTable = $this->getDataTable('UserCountry_continent', $idSite, $period, $date); $dataTable->filter('ColumnCallbackReplace', array('label', 'Piwik_ContinentTranslate')); $dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'code', create_function('$label', 'return $label;'))); return $dataTable; } - static protected function getDataTable($name, $idSite, $period, $date) + protected function getDataTable($name, $idSite, $period, $date) { Piwik::checkUserHasViewAccess( $idSite ); $archive = Piwik_Archive::build($idSite, $period, $date ); @@ -67,7 +67,7 @@ class Piwik_UserCountry_API return $dataTable; } - static public function getNumberOfDistinctCountries($idSite, $period, $date) + public function getNumberOfDistinctCountries($idSite, $period, $date) { Piwik::checkUserHasViewAccess( $idSite ); $archive = Piwik_Archive::build($idSite, $period, $date ); |