diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-13 08:42:30 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-13 08:42:30 +0400 |
| commit | 0b6952a0fbd694b299463ad7d2019a006422387e (patch) | |
| tree | 348a85e31fa0dbcb66e50d040f0573f65690be2f /core/API | |
| parent | b4d1ff06a14d48643a7050370036503a9a0ae893 (diff) | |
the property $genericFiltersInfo was not used so I removed it
Diffstat (limited to 'core/API')
| -rw-r--r-- | core/API/DataTableGenericFilter.php | 88 |
1 files changed, 41 insertions, 47 deletions
diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php index 6b24e00c6a..0fe56c57d0 100644 --- a/core/API/DataTableGenericFilter.php +++ b/core/API/DataTableGenericFilter.php @@ -15,8 +15,6 @@ use Piwik\DataTable; class DataTableGenericFilter { - private static $genericFiltersInfo = null; - /** * Constructor * @@ -51,51 +49,47 @@ class DataTableGenericFilter */ public static function getGenericFiltersInformation() { - if (is_null(self::$genericFiltersInfo)) { - self::$genericFiltersInfo = array( - array('Pattern', - array( - 'filter_column' => array('string', 'label'), - 'filter_pattern' => array('string') - )), - array('PatternRecursive', - array( - 'filter_column_recursive' => array('string', 'label'), - 'filter_pattern_recursive' => array('string'), - )), - array('ExcludeLowPopulation', - array( - 'filter_excludelowpop' => array('string'), - 'filter_excludelowpop_value' => array('float', '0'), - )), - array('AddColumnsProcessedMetrics', - array( - 'filter_add_columns_when_show_all_columns' => array('integer') - )), - array('AddColumnsProcessedMetricsGoal', - array( - 'filter_update_columns_when_show_all_goals' => array('integer'), - 'idGoal' => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW), - )), - array('Sort', - array( - 'filter_sort_column' => array('string'), - 'filter_sort_order' => array('string', 'desc'), - )), - array('Truncate', - array( - 'filter_truncate' => array('integer'), - )), - array('Limit', - array( - 'filter_offset' => array('integer', '0'), - 'filter_limit' => array('integer'), - 'keep_summary_row' => array('integer', '0'), - )), - ); - } - - return self::$genericFiltersInfo; + return array( + array('Pattern', + array( + 'filter_column' => array('string', 'label'), + 'filter_pattern' => array('string') + )), + array('PatternRecursive', + array( + 'filter_column_recursive' => array('string', 'label'), + 'filter_pattern_recursive' => array('string'), + )), + array('ExcludeLowPopulation', + array( + 'filter_excludelowpop' => array('string'), + 'filter_excludelowpop_value' => array('float', '0'), + )), + array('AddColumnsProcessedMetrics', + array( + 'filter_add_columns_when_show_all_columns' => array('integer') + )), + array('AddColumnsProcessedMetricsGoal', + array( + 'filter_update_columns_when_show_all_goals' => array('integer'), + 'idGoal' => array('string', AddColumnsProcessedMetricsGoal::GOALS_OVERVIEW), + )), + array('Sort', + array( + 'filter_sort_column' => array('string'), + 'filter_sort_order' => array('string', 'desc'), + )), + array('Truncate', + array( + 'filter_truncate' => array('integer'), + )), + array('Limit', + array( + 'filter_offset' => array('integer', '0'), + 'filter_limit' => array('integer'), + 'keep_summary_row' => array('integer', '0'), + )), + ); } /** |