Change other occurances of getRequestString. Forgot to do in last commit.

3 files changed, 13 insertions, 11 deletions

diff --git a/core/ViewDataTable/HtmlTable.php b/core/ViewDataTable/HtmlTable.php
index f0a9131b09..bd901cc100 100644
--- a/core/ViewDataTable/HtmlTable.php
+++ b/core/ViewDataTable/HtmlTable.php
@@ -200,13 +200,13 @@ class Piwik_ViewDataTable_HtmlTable extends Piwik_ViewDataTable
         $this->viewProperties['search_recursive'] = true;
     }
 
-    protected function getRequestString()
+    protected function getRequestArray()
     {
-        $requestString = parent::getRequestString();
+        $requestArray = parent::getRequestArray();
         if (parent::shouldLoadExpanded()) {
-            $requestString .= '&expanded=1';
+            $requestArray['expanded'] = 1;
         }
-        return $requestString;
+        return $requestArray;
     }
 
     /**
diff --git a/core/ViewDataTable/HtmlTable/AllColumns.php b/core/ViewDataTable/HtmlTable/AllColumns.php
index 3381c85891..9b1a1f77d3 100644
--- a/core/ViewDataTable/HtmlTable/AllColumns.php
+++ b/core/ViewDataTable/HtmlTable/AllColumns.php
@@ -26,10 +26,11 @@ class Piwik_ViewDataTable_HtmlTable_AllColumns extends Piwik_ViewDataTable_HtmlT
         parent::main();
     }
 
-    protected function getRequestString()
+    protected function getRequestArray()
     {
-        $requestString = parent::getRequestString();
-        return $requestString . '&filter_add_columns_when_show_all_columns=1';
+        $requestArray = parent::getRequestArray();
+        $requestArray['filter_add_columns_when_show_all_columns'] = 1;
+        return $requestArray;
     }
 
     protected function postDataTableLoadedFromAPI()
diff --git a/core/ViewDataTable/HtmlTable/Goals.php b/core/ViewDataTable/HtmlTable/Goals.php
index 7b407e8d17..b116217d8d 100644
--- a/core/ViewDataTable/HtmlTable/Goals.php
+++ b/core/ViewDataTable/HtmlTable/Goals.php
@@ -214,15 +214,16 @@ class Piwik_ViewDataTable_HtmlTable_Goals extends Piwik_ViewDataTable_HtmlTable
         }
     }
 
-    protected function getRequestString()
+    protected function getRequestArray()
     {
-        $requestString = parent::getRequestString();
+        $requestArray = parent::getRequestArray();
         if ($this->processOnlyIdGoal > Piwik_DataTable_Filter_AddColumnsProcessedMetricsGoal::GOALS_FULL_TABLE
             || $this->isEcommerce
         ) {
-            $requestString .= "&idGoal=" . $this->processOnlyIdGoal;
+            $requestArray["idGoal"] = $this->processOnlyIdGoal;
         }
-        return $requestString . '&filter_update_columns_when_show_all_goals=1';
+        $requestArray['filter_update_columns_when_show_all_goals'] = 1;
+        return $requestArray;
     }
 
     protected $columnsToRevenueFilter = array();