From 4c40f8212d3261dc46da5551f88e395d3cc349c3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Mon, 10 Jun 2013 14:54:59 +0100
Subject: [PATCH] Issue #2002474 by heddn, brennanmh: Rename Views method
element_label_type() to elementLabelType().
---
.../views/Plugin/views/field/FieldPluginBase.php | 2 +-
core/modules/views/views.theme.inc | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 9473a8baeb92..bd3c0d1c4e72 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -226,7 +226,7 @@ public function elementType($none_supported = FALSE, $default_empty = FALSE, $in
/**
* Return an HTML element for the label based upon the field's element type.
*/
- function element_label_type($none_supported = FALSE, $default_empty = FALSE) {
+ public function elementLabelType($none_supported = FALSE, $default_empty = FALSE) {
if ($none_supported) {
if ($this->options['element_label_type'] === '0') {
return '';
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index 12cc7cf232b4..10c771b7ba59 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -290,8 +290,8 @@ function template_preprocess_views_view_fields(&$vars) {
$object->label_html .= ': ';
}
- $object->element_label_type = $object->handler->element_label_type(TRUE, !$vars['options']['default_field_elements']);
- if ($object->element_label_type) {
+ $object->elementLabelType = $object->handler->elementLabelType(TRUE, !$vars['options']['default_field_elements']);
+ if ($object->elementLabelType) {
$attributes = array();
if ($object->handler->options['element_default_classes']) {
$attributes['class'][] = 'views-label';
@@ -304,11 +304,11 @@ function template_preprocess_views_view_fields(&$vars) {
}
$attributes = new Attribute($attributes);
- $pre = '<' . $object->element_label_type;
+ $pre = '<' . $object->elementLabelType;
$pre .= $attributes;
$pre .= '>';
- $object->label_html = $pre . $object->label_html . '</' . $object->element_label_type . '>';
+ $object->label_html = $pre . $object->label_html . '</' . $object->elementLabelType . '>';
}
}
@@ -626,7 +626,7 @@ function template_preprocess_views_view_table(&$vars) {
}
// Add a header label wrapper if one was selected.
if ($vars['header'][$field]) {
- $element_label_type = $fields[$field]->element_label_type(TRUE, TRUE);
+ $element_label_type = $fields[$field]->elementLabelType(TRUE, TRUE);
if ($element_label_type) {
$vars['header'][$field] = '<' . $element_label_type . '>' . $vars['header'][$field] . '</' . $element_label_type . '>';
}
--
GitLab