diff options
author | Fabian Becker <halfdan@xnorfz.de> | 2013-03-01 11:42:34 +0400 |
---|---|---|
committer | Fabian Becker <halfdan@xnorfz.de> | 2013-03-01 11:46:57 +0400 |
commit | 702e4d26518696336635d012b9f4deffa51f57a7 (patch) | |
tree | 480f200bbe848e2bd9e9b8a0ea32df33f2a5921b | |
parent | 78d234f834aecf8e3b713c5de1a3a23f424b77ea (diff) |
Revert changes, !count -> empty()
No need for array_values
-rw-r--r-- | core/DataTable.php | 2 | ||||
-rw-r--r-- | plugins/Goals/Controller.php | 2 | ||||
-rw-r--r-- | plugins/Referers/Controller.php | 2 | ||||
-rw-r--r-- | plugins/VisitFrequency/Controller.php | 2 | ||||
-rw-r--r-- | plugins/VisitsSummary/Controller.php | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/core/DataTable.php b/core/DataTable.php index a8bd09a288..c45d170d9f 100644 --- a/core/DataTable.php +++ b/core/DataTable.php @@ -1176,7 +1176,7 @@ class Piwik_DataTable // if we detect such a "simple" data structure we convert it to a row with the correct columns' names $thisIsNotThatSimple = false; - foreach(array_values($array) as $columnValue ) + foreach($array as $columnValue ) { if(is_array($columnValue) || is_object($columnValue)) { diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php index abf59d02d9..2b423bf9db 100644 --- a/plugins/Goals/Controller.php +++ b/plugins/Goals/Controller.php @@ -294,7 +294,7 @@ class Piwik_Goals_Controller extends Piwik_Controller public function getEvolutionGraph( $fetch = false, array $columns = array(), $idGoal = false) { - if(!count($columns)) + if(empty($columns)) { $columns = Piwik_Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index d208fc2584..fbbf3c14e4 100644 --- a/plugins/Referers/Controller.php +++ b/plugins/Referers/Controller.php @@ -471,7 +471,7 @@ class Piwik_Referers_Controller extends Piwik_Controller $view->addTotalRow(); // configure displayed columns - if(!count($columns)) + if(empty($columns)) { $columns = Piwik_Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); diff --git a/plugins/VisitFrequency/Controller.php b/plugins/VisitFrequency/Controller.php index e51c5f2d59..ba7cf432d1 100644 --- a/plugins/VisitFrequency/Controller.php +++ b/plugins/VisitFrequency/Controller.php @@ -32,7 +32,7 @@ class Piwik_VisitFrequency_Controller extends Piwik_Controller public function getEvolutionGraph( $fetch = false, array $columns = array()) { - if(!count($columns)) + if(empty($columns)) { $columns = Piwik_Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 65320bb2b4..dec6a70957 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -34,7 +34,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller public function getEvolutionGraph( $fetch = false, array $columns = array()) { - if(!count($columns)) + if(empty($columns)) { $columns = Piwik_Common::getRequestVar('columns'); $columns = Piwik::getArrayFromApiParameter($columns); |