this makes flatten pageUrls much faster

2 files changed, 14 insertions, 1 deletions

diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 862f2db087..23036c8e82 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -114,6 +114,14 @@ abstract class DataTableManipulator
             return null;
         }
 
+        if ($row->getMetadata('idsubdatatable_in_db')) {
+            $manager = DataTable\Manager::getInstance();
+            $table = $manager->getTable($idSubTable);
+            if ($table) {
+                return $table;
+            }
+        }
+
         $request['idSubtable'] = $idSubTable;
         if ($dataTable) {
             $period = $dataTable->getMetadata(DataTableFactory::TABLE_METADATA_PERIOD_INDEX);
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index 91f1d70c45..0ec50bceea 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -88,10 +88,15 @@ class API extends \Piwik\Plugin\API
      * @return DataTable|DataTable\Map
      */
     public function getPageUrls($idSite, $period, $date, $segment = false, $expanded = false, $idSubtable = false,
-                                $depth = false)
+                                $depth = false, $flat= false)
     {
+        if ($flat && !$idSubtable) {
+            $expanded = true;
+        }
+
         $dataTable = $this->getDataTableFromArchive('Actions_actions_url', $idSite, $period, $date, $segment, $expanded, $idSubtable, $depth);
         $this->filterActionsDataTable($dataTable, $expanded);
+
         return $dataTable;
     }