diff options
author | mattpiwik <matthieu.aubry@gmail.com> | 2011-03-23 04:59:57 +0300 |
---|---|---|
committer | mattpiwik <matthieu.aubry@gmail.com> | 2011-03-23 04:59:57 +0300 |
commit | 66164854e74551aadc222c423f2edc88593b81b8 (patch) | |
tree | 3903f86d8ec94b207a1b60ef5113a7fd85df15dc /core/DataTable/Filter/Sort.php | |
parent | ea66910a54d1c9933cb3b96f0bcfcfdf8a69ec55 (diff) |
Refs #2218 Thanks for the tip Anthon, it helped me see the light...
Now the filter object itself will take care of applying recursively when the table was recursively loaded indeed.
Leaving open until I can check that all occurences on demo are fixed
git-svn-id: http://dev.piwik.org/svn/trunk@4169 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/DataTable/Filter/Sort.php')
-rw-r--r-- | core/DataTable/Filter/Sort.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php index ac6da62990..03ce146dfc 100644 --- a/core/DataTable/Filter/Sort.php +++ b/core/DataTable/Filter/Sort.php @@ -25,10 +25,6 @@ class Piwik_DataTable_Filter_Sort extends Piwik_DataTable_Filter public function __construct( $table, $columnToSort, $order = 'desc', $naturalSort = true, $recursiveSort = false ) { parent::__construct($table); - if(empty($columnToSort)) - { - return; - } if($recursiveSort) { $table->enableRecursiveSort(); @@ -36,7 +32,6 @@ class Piwik_DataTable_Filter_Sort extends Piwik_DataTable_Filter $this->columnToSort = $columnToSort; $this->naturalSort = $naturalSort; $this->setOrder($order); - $this->filter($table); } function setOrder($order) @@ -149,12 +144,16 @@ class Piwik_DataTable_Filter_Sort extends Piwik_DataTable_Filter return $this->columnToSort; } - protected function filter($table) + public function filter($table) { if($table instanceof Piwik_DataTable_Simple) { return; } + if(empty($this->columnToSort)) + { + return; + } $rows = $table->getRows(); if(count($rows) == 0) { |