Commit 547031cb authored by alexpott's avatar alexpott

Issue #2002904 by Psikik: Rename Views method get_elements() to getElements().

parent f013f081
......@@ -270,7 +270,7 @@ public function elementWrapperType($none_supported = FALSE, $default_empty = FAL
* elements available, though this seems like it would be an incredibly
* rare occurence.
*/
function get_elements() {
public function getElements() {
static $elements = NULL;
if (!isset($elements)) {
// @todo Add possible html5 elements.
......@@ -546,7 +546,7 @@ public function buildOptionsForm(&$form, &$form_state) {
);
$form['element_type'] = array(
'#title' => t('HTML element'),
'#options' => $this->get_elements(),
'#options' => $this->getElements(),
'#type' => 'select',
'#default_value' => $this->options['element_type'],
'#description' => t('Choose the HTML element to wrap around this field, e.g. H1, H2, etc.'),
......@@ -591,7 +591,7 @@ public function buildOptionsForm(&$form, &$form_state) {
);
$form['element_label_type'] = array(
'#title' => t('Label HTML element'),
'#options' => $this->get_elements(FALSE),
'#options' => $this->getElements(FALSE),
'#type' => 'select',
'#default_value' => $this->options['element_label_type'],
'#description' => t('Choose the HTML element to wrap around this label, e.g. H1, H2, etc.'),
......@@ -635,7 +635,7 @@ public function buildOptionsForm(&$form, &$form_state) {
);
$form['element_wrapper_type'] = array(
'#title' => t('Wrapper HTML element'),
'#options' => $this->get_elements(FALSE),
'#options' => $this->getElements(FALSE),
'#type' => 'select',
'#default_value' => $this->options['element_wrapper_type'],
'#description' => t('Choose the HTML element to wrap around this field and label, e.g. H1, H2, etc. This may not be used if the field and label are not rendered together, such as with a table.'),
......
......@@ -405,7 +405,7 @@ public function testFieldClasses() {
}
// Tests the available html elements.
$element_types = $id_field->get_elements();
$element_types = $id_field->getElements();
$expected_elements = array(
'',
0,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment