Merge branch 'master' into php-5.3-namespaces

Conflicts:
	core/Access.php
	core/Config.php
	core/EventDispatcher.php
	core/JqplotDataGenerator/Evolution.php
	core/Piwik.php
	core/Plugin/MetadataLoader.php
	core/ViewDataTable.php
	core/ViewDataTable/Cloud.php
	core/ViewDataTable/GenerateGraphHTML.php
	core/ViewDataTable/HtmlTable.php
	core/ViewDataTable/HtmlTable/AllColumns.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Controller.php
	plugins/CoreHome/Controller.php
	plugins/CoreHome/DataTableRowAction/RowEvolution.php
	plugins/CoreHome/templates/_dataTable.twig
	plugins/CustomVariables/Controller.php
	plugins/DBStats/Controller.php
	plugins/DevicesDetection/Controller.php
	plugins/ExampleUI/Controller.php
	plugins/Goals/Controller.php
	plugins/Live/Controller.php
	plugins/Provider/Controller.php
	plugins/Referers/Controller.php
	plugins/UserCountry/Controller.php
	plugins/UserCountryMap/Controller.php
	plugins/UserSettings/Archiver.php
	plugins/UserSettings/Controller.php
	plugins/VisitTime/Controller.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/Controller.php
	plugins/VisitsSummary/Controller.php
	tests/PHPUnit/proxy/index.php

1 files changed, 14 insertions, 20 deletions

diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index fdc75d1891..f7bcef4b1f 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -627,27 +627,21 @@ class Piwik_Actions extends Plugin
         }
     }
 
-    public function getReportDisplayProperties(&$properties, $apiAction)
+    public function getReportDisplayProperties(&$properties)
     {
-        $reportViewProperties = array(
-            'Actions.getPageUrls' => $this->getDisplayPropertiesForPageUrls(),
-            'Actions.getEntryPageUrls' => $this->getDisplayPropertiesForEntryPageUrls(),
-            'Actions.getExitPageUrls' => $this->getDisplayPropertiesForExitPageUrls(),
-            'Actions.getSiteSearchKeywords' => $this->getDisplayPropertiesForSiteSearchKeywords(),
-            'Actions.getSiteSearchNoResultKeywords' => $this->getDisplayPropertiesForSiteSearchNoResultKeywords(),
-            'Actions.getSiteSearchCategories' => $this->getDisplayPropertiesForSiteSearchCategories(),
-            'Actions.getPageUrlsFollowingSiteSearch' => $this->getDisplayPropertiesForGetPageUrlsOrTitlesFollowingSiteSearch(false),
-            'Actions.getPageTitlesFollowingSiteSearch' => $this->getDisplayPropertiesForGetPageUrlsOrTitlesFollowingSiteSearch(true),
-            'Actions.getPageTitles' => $this->getDisplayPropertiesForGetPageTitles(),
-            'Actions.getEntryPageTitles' => $this->getDisplayPropertiesForGetEntryPageTitles(),
-            'Actions.getExitPageTitles' => $this->getDisplayPropertiesForGetExitPageTitles(),
-            'Actions.getDownloads' => $this->getDisplayPropertiesForGetDownloads(),
-            'Actions.getOutlinks' => $this->getDisplayPropertiesForGetOutlinks(),
-        );
-        
-        if (isset($reportViewProperties[$apiAction])) {
-            $properties = $reportViewProperties[$apiAction];
-        }
+        $properties['Actions.getPageUrls'] = $this->getDisplayPropertiesForPageUrls();
+        $properties['Actions.getEntryPageUrls'] =  $this->getDisplayPropertiesForEntryPageUrls();
+        $properties['Actions.getExitPageUrls'] =  $this->getDisplayPropertiesForExitPageUrls();
+        $properties['Actions.getSiteSearchKeywords'] =  $this->getDisplayPropertiesForSiteSearchKeywords();
+        $properties['Actions.getSiteSearchNoResultKeywords'] =  $this->getDisplayPropertiesForSiteSearchNoResultKeywords();
+        $properties['Actions.getSiteSearchCategories'] =  $this->getDisplayPropertiesForSiteSearchCategories();
+        $properties['Actions.getPageUrlsFollowingSiteSearch'] =  $this->getDisplayPropertiesForGetPageUrlsOrTitlesFollowingSiteSearch(false);
+        $properties['Actions.getPageTitlesFollowingSiteSearch'] =  $this->getDisplayPropertiesForGetPageUrlsOrTitlesFollowingSiteSearch(true);
+        $properties['Actions.getPageTitles'] =  $this->getDisplayPropertiesForGetPageTitles();
+        $properties['Actions.getEntryPageTitles'] =  $this->getDisplayPropertiesForGetEntryPageTitles();
+        $properties['Actions.getExitPageTitles'] =  $this->getDisplayPropertiesForGetExitPageTitles();
+        $properties['Actions.getDownloads'] =  $this->getDisplayPropertiesForGetDownloads();
+        $properties['Actions.getOutlinks'] =  $this->getDisplayPropertiesForGetOutlinks();
     }
     
     private function addBaseDisplayProperties(&$result)