summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Pott2013-06-05 06:48:07 (GMT)
committerAlex Pott2013-06-05 06:48:07 (GMT)
commit9ae13bc8e1286e78ba650f17ae7407e2938d8e19 (patch)
treec2ba6a84c20a05946284e9222fab3f43bb5f20ce
parent93dadb928e482c410a96bb2f204112de2cabeaa0 (diff)
Issue #2003310 by Dan Reinders, phenaproxima: Rename Views method sanitize_columns() to sanitizeColumns().
-rw-r--r--core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php4
-rw-r--r--core/modules/views/views.theme.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
index 91af6e1..06bffcb 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/style/Table.php
@@ -185,7 +185,7 @@ class Table extends StylePluginBase {
* @return array
* An array of all the sanitized columns.
*/
- function sanitize_columns($columns, $fields = NULL) {
+ public function sanitizeColumns($columns, $fields = NULL) {
$sanitized = array();
if ($fields === NULL) {
$fields = $this->displayHandler->getOption('fields');
@@ -254,7 +254,7 @@ class Table extends StylePluginBase {
// will have to register your theme handlers if you do stuff like this.
$form['#theme'] = 'views_ui_style_plugin_table';
- $columns = $this->sanitize_columns($this->options['columns']);
+ $columns = $this->sanitizeColumns($this->options['columns']);
// Create an array of allowed columns from the data we know:
$field_names = $this->displayHandler->getFieldLabels();
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 5fc95ae..680702a 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -551,7 +551,7 @@ function template_preprocess_views_view_table(&$vars) {
$row_class_special = isset($options['row_class_special']) ? $options['row_class_special'] : TRUE;
$fields = &$view->field;
- $columns = $handler->sanitize_columns($options['columns'], $fields);
+ $columns = $handler->sanitizeColumns($options['columns'], $fields);
$active = !empty($handler->active) ? $handler->active : '';
$order = !empty($handler->order) ? $handler->order : 'asc';