fixes #5162 settings rows to display and isFooterExpandedInDashboard …

…was ignored by visitorlog
matomo-org · May 14, 2014 · 15fa68a · 15fa68a
1 parent 6b18957
commit 15fa68a
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/plugins/Live/VisitorLog.php b/plugins/Live/VisitorLog.php
@@ -37,8 +37,11 @@ public function beforeLoadDataTable()
             'filter_sort_order',
         ));
 
+        if (!is_numeric($this->requestConfig->filter_limit)) {
+            $this->requestConfig->filter_limit = 20;
+        }
+
         $this->requestConfig->filter_sort_column = 'idVisit';
-        $this->requestConfig->filter_limit       = 20;
         $this->requestConfig->disable_generic_filters = true;
 
         $offset = Common::getRequestVar('filter_offset', 0);
@@ -65,15 +68,16 @@ public function beforeRender()
         $this->config->documentation = Piwik::translate('Live_VisitorLogDocumentation', array('<br />', '<br />'));
 
         $filterEcommerce = Common::getRequestVar('filterEcommerce', 0, 'int');
-        $this->config->custom_parameters = array(
-            // set a very high row count so that the next link in the footer of the data table is always shown
-            'totalRows'         => 10000000,
 
-            'filterEcommerce'   => $filterEcommerce,
-            'pageUrlNotDefined' => Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL')),
+        if (!is_array($this->config->custom_parameters)) {
+            $this->config->custom_parameters = array();
+        }
 
-            'smallWidth'        => 1 == Common::getRequestVar('small', 0, 'int'),
-        );
+        // set a very high row count so that the next link in the footer of the data table is always shown
+        $this->config->custom_parameters['totalRows'] = 10000000;
+        $this->config->custom_parameters['smallWidth'] = (1 == Common::getRequestVar('small', 0, 'int'));
+        $this->config->custom_parameters['filterEcommerce'] = $filterEcommerce;
+        $this->config->custom_parameters['pageUrlNotDefined'] = Piwik::translate('General_NotDefined', Piwik::translate('Actions_ColumnPageURL'));
 
         $this->config->footer_icons = array(
             array(