Merge branch 'master' into vdt

2 files changed, 17 insertions, 3 deletions

diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 263e3e4a6b..768389f8c0 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -288,7 +288,12 @@ class Piwik_Actions_API
         return $dataTable;
     }
 
-    //Visitors can search, and then click "next" to view more results. This is the average number of search results pages viewed for this keyword.
+    /**
+     * Visitors can search, and then click "next" to view more results. This is the average number of search results pages viewed for this keyword.
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
+     * @param string $columnToRead
+     */
     protected function addPagesPerSearchColumn($dataTable, $columnToRead = 'nb_hits')
     {
         $dataTable->filter('ColumnCallbackAddColumnQuotient', array('nb_pages_per_search', $columnToRead, 'nb_visits', $precision = 1));
@@ -463,6 +468,8 @@ class Piwik_Actions_API
 
     /**
      * Common filters for Page URLs and Page Titles
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
      */
     protected function filterPageDatatable($dataTable)
     {
@@ -507,7 +514,10 @@ class Piwik_Actions_API
     }
 
     /**
-     * Common filters for all Actions API getters
+     * Common filters for all Actions API
+     *
+     * @param DataTable|DataTable\Simple|DataTable\Map $dataTable
+     * @param bool $expanded
      */
     protected function filterActionsDataTable($dataTable, $expanded = false)
     {
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 187ac5f1fe..20b3985e14 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -681,7 +681,11 @@ class Piwik_Actions extends Plugin
 
         return $result;
     }
-    
+
+    /**
+     * @param \Piwik\DataTable $dataTable
+     * @param int $level
+     */
     public static function setDataTableRowLevels($dataTable, $level = 0)
     {
         foreach ($dataTable->getRows() as $row) {