1 files changed, 15 insertions, 15 deletions

diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index e87de7efe6..6d5e9c81d8 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -35,7 +35,7 @@ class Piwik_UserSettings_API
 		return self::$instance;
 	}
 	
-	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 );
@@ -45,56 +45,56 @@ class Piwik_UserSettings_API
 		return $dataTable;
 	}
 
-	static public function getResolution( $idSite, $period, $date )
+	public function getResolution( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_resolution', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_resolution', $idSite, $period, $date);
 		return $dataTable;
 	}
 
-	static public function getConfiguration( $idSite, $period, $date )
+	public function getConfiguration( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_configuration', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_configuration', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getConfigurationLabel'));
 		return $dataTable;
 	}
 
-	static public function getOS( $idSite, $period, $date )
+	public function getOS( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_os', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_os', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getOSLogo'));
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array( 'label', 'shortLabel', 'Piwik_getOSShortLabel') );
 		$dataTable->queueFilter('ColumnCallbackReplace', array( 'label', 'Piwik_getOSLabel') );
 		return $dataTable;
 	}
 		
-	static public function getBrowser( $idSite, $period, $date )
+	public function getBrowser( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_browser', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_browser', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getBrowsersLogo'));
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'shortLabel', 'Piwik_getBrowserShortLabel'));
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserLabel'));
 		return $dataTable;
 	}
 	
-	static public function getBrowserType( $idSite, $period, $date )
+	public function getBrowserType( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_browserType', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_browserType', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'shortLabel', 'ucfirst'));
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'Piwik_getBrowserTypeLabel'));
 		return $dataTable;
 	}
 	
-	static public function getWideScreen( $idSite, $period, $date )
+	public function getWideScreen( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_wideScreen', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_wideScreen', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getScreensLogo'));
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
 		return $dataTable;
 	}
 	
-	static public function getPlugin( $idSite, $period, $date )
+	public function getPlugin( $idSite, $period, $date )
 	{
-		$dataTable = self::getDataTable('UserSettings_plugin', $idSite, $period, $date);
+		$dataTable = $this->getDataTable('UserSettings_plugin', $idSite, $period, $date);
 		$dataTable->queueFilter('ColumnCallbackAddMetadata', array('label', 'logo', 'Piwik_getPluginsLogo'));
 		$dataTable->queueFilter('ColumnCallbackReplace', array('label', 'ucfirst'));
 		return $dataTable;