From 3905c51ad3ad3306f12ff23d143b312c87f20048 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Thu, 30 Aug 2012 11:23:13 +0200
Subject: [PATCH] Issue #1762662 by dawehner, tim.plunkett: Cleanup methods on
DisplayPluginBase.
---
includes/admin.inc | 156 ++---
includes/ajax.inc | 2 +-
includes/analyze.inc | 2 +-
lib/Drupal/views/Plugin/views/HandlerBase.php | 4 +-
.../Plugin/views/access/AccessPluginBase.php | 2 +-
lib/Drupal/views/Plugin/views/area/Text.php | 4 +-
.../views/argument/ArgumentPluginBase.php | 6 +-
.../Plugin/views/cache/CachePluginBase.php | 4 +-
.../views/Plugin/views/display/Attachment.php | 62 +-
.../views/Plugin/views/display/Block.php | 54 +-
.../Plugin/views/display/DefaultDisplay.php | 4 +-
.../views/display/DisplayPluginBase.php | 604 +++++++++---------
.../views/Plugin/views/display/Feed.php | 50 +-
.../views/Plugin/views/display/Page.php | 56 +-
.../DisplayExtenderPluginBase.php | 18 +-
.../exposed_form/ExposedFormPluginBase.php | 8 +-
.../views/exposed_form/InputRequired.php | 2 +-
.../Plugin/views/field/ContextualLinks.php | 2 +-
.../Plugin/views/field/FieldPluginBase.php | 8 +-
.../views/Plugin/views/filter/Combine.php | 2 +-
.../Plugin/views/filter/FilterPluginBase.php | 10 +-
lib/Drupal/views/Plugin/views/pager/Full.php | 2 +-
lib/Drupal/views/Plugin/views/pager/Some.php | 2 +-
lib/Drupal/views/Plugin/views/row/Fields.php | 2 +-
.../views/Plugin/views/row/RowPluginBase.php | 4 +-
.../views/Plugin/views/row/RssFields.php | 2 +-
lib/Drupal/views/Plugin/views/style/Rss.php | 2 +-
.../Plugin/views/style/StylePluginBase.php | 10 +-
lib/Drupal/views/Plugin/views/style/Table.php | 6 +-
.../Plugin/views/wizard/WizardPluginBase.php | 14 +-
lib/Drupal/views/Tests/BasicTest.php | 4 +-
.../views/Tests/Handler/AreaTextTest.php | 2 +-
.../views/Tests/Handler/ArgumentNullTest.php | 4 +-
.../views/Tests/Handler/FieldBooleanTest.php | 2 +-
.../views/Tests/Handler/FieldCounterTest.php | 4 +-
.../views/Tests/Handler/FieldCustomTest.php | 2 +-
.../views/Tests/Handler/FieldDateTest.php | 2 +-
.../views/Tests/Handler/FieldFileSizeTest.php | 2 +-
.../views/Tests/Handler/FieldUrlTest.php | 4 +-
.../views/Tests/Handler/FieldXssTest.php | 2 +-
.../views/Tests/Handler/FilterCombineTest.php | 2 +-
.../Tests/Handler/FilterEqualityTest.php | 8 +-
.../Tests/Handler/FilterInOperatorTest.php | 8 +-
.../views/Tests/Handler/FilterNumericTest.php | 22 +-
.../views/Tests/Handler/FilterStringTest.php | 52 +-
.../views/Tests/Handler/SortDateTest.php | 4 +-
.../views/Tests/Handler/SortRandomTest.php | 2 +-
lib/Drupal/views/Tests/Handler/SortTest.php | 8 +-
.../views/Tests/Language/ArgumentLanguage.php | 2 +-
.../views/Tests/Language/FieldLanguage.php | 2 +-
.../views/Tests/Language/FilterLanguage.php | 2 +-
lib/Drupal/views/Tests/Plugin/AccessTest.php | 8 +-
lib/Drupal/views/Tests/Plugin/CacheTest.php | 14 +-
lib/Drupal/views/Tests/Plugin/DisplayTest.php | 6 +-
.../views/Tests/Plugin/ExposedFormTest.php | 4 +-
lib/Drupal/views/Tests/Plugin/PagerTest.php | 8 +-
lib/Drupal/views/Tests/Plugin/StyleTest.php | 8 +-
lib/Drupal/views/Tests/ViewTestBase.php | 6 +-
lib/Drupal/views/View.php | 60 +-
lib/Drupal/views/ViewStorage.php | 12 +-
lib/Views/field/Plugin/views/field/Field.php | 2 +-
lib/Views/search/Plugin/views/field/Score.php | 4 +-
.../Plugin/views/filter/TaxonomyIndexTid.php | 2 +-
modules/node.views.inc | 10 +-
theme/theme.inc | 20 +-
views.module | 14 +-
views_ui.module | 6 +-
67 files changed, 715 insertions(+), 713 deletions(-)
diff --git a/includes/admin.inc b/includes/admin.inc
index fbf18faed88c..935fa64225e5 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -127,7 +127,7 @@ function views_ui_preview($view, $display_id, $args = array()) {
$view->setArguments($args);
// Store the current view URL for later use:
- if ($view->display_handler->get_option('path')) {
+ if ($view->display_handler->getOption('path')) {
$path = $view->getUrl();
}
@@ -682,8 +682,8 @@ function views_ui_add_form_save_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/structure/views';
if (!empty($view->display['page'])) {
$display = $view->display['page'];
- if ($display->handler->has_path()) {
- $one_path = $display->handler->get_option('path');
+ if ($display->handler->hasPath()) {
+ $one_path = $display->handler->getOption('path');
if (strpos($one_path, '%') === FALSE) {
$form_state['redirect'] = $one_path; // PATH TO THE VIEW IF IT HAS ONE
return;
@@ -1075,7 +1075,7 @@ function views_ui_edit_form($form, &$form_state, $view, $display_id = NULL) {
$form['displays']['settings']['tab_title']['#markup'] = '<h2 id="edit-display-settings-title" class="ctools-collapsible-handle">' . t('@display_title details', array('@display_title' => ucwords($display_title))) . '</h2>';
// Add a text that the display is disabled.
if (!empty($view->display[$display_id]->handler)) {
- $enabled = $view->display[$display_id]->handler->get_option('enabled');
+ $enabled = $view->display[$display_id]->handler->getOption('enabled');
if (empty($enabled)) {
$form['displays']['settings']['disabled']['#markup'] = t('This display is disabled.');
}
@@ -1351,8 +1351,8 @@ function views_ui_edit_form_submit_undo_delete_display($form, &$form_state) {
*/
function views_ui_edit_form_submit_enable_display($form, &$form_state) {
$id = $form_state['display_id'];
- // set_option doesn't work because this would might affect upper displays
- $form_state['view']->display[$id]->handler->set_option('enabled', TRUE);
+ // setOption doesn't work because this would might affect upper displays
+ $form_state['view']->display[$id]->handler->setOption('enabled', TRUE);
// Store in cache
views_ui_cache_set($form_state['view']);
@@ -1366,7 +1366,7 @@ function views_ui_edit_form_submit_enable_display($form, &$form_state) {
*/
function views_ui_edit_form_submit_disable_display($form, &$form_state) {
$id = $form_state['display_id'];
- $form_state['view']->display[$id]->handler->set_option('enabled', FALSE);
+ $form_state['view']->display[$id]->handler->setOption('enabled', FALSE);
// Store in cache
views_ui_cache_set($form_state['view']);
@@ -1528,8 +1528,8 @@ function views_ui_get_display_tab_details($view, $display) {
$is_display_deleted = !empty($display->deleted);
// The master display cannot be cloned.
$is_default = $display->id == 'default';
- // @todo: Figure out why get_option doesn't work here.
- $is_enabled = $display->handler->get_option('enabled');
+ // @todo: Figure out why getOption doesn't work here.
+ $is_enabled = $display->handler->getOption('enabled');
if (!$is_display_deleted && !$is_default) {
$prefix = '<div class="ctools-no-js ctools-button ctools-dropbutton"><div class="ctools-link"><a href="#" class="ctools-twisty ctools-text">open</a></div><div class="ctools-content"><ul class="horizontal right actions">';
@@ -1565,8 +1565,8 @@ function views_ui_get_display_tab_details($view, $display) {
);
}
// Add a link to view the page.
- elseif ($display->handler->has_path()) {
- $path = $display->handler->get_path();
+ elseif ($display->handler->hasPath()) {
+ $path = $display->handler->getPath();
if (strpos($path, '%') === FALSE) {
$build['top']['actions']['path'] = array(
'#type' => 'link',
@@ -1623,7 +1623,7 @@ function views_ui_get_display_tab_details($view, $display) {
$build['top']['display_title'] = array(
'#theme' => 'views_ui_display_tab_setting',
'#description' => t('Display name'),
- '#link' => $display->handler->option_link(check_plain($display_title), 'display_title'),
+ '#link' => $display->handler->optionLink(check_plain($display_title), 'display_title'),
);
}
@@ -1664,7 +1664,7 @@ function views_ui_get_display_tab_details($view, $display) {
// Fetch options from the display plugin, with a list of buckets they go into.
$options = array();
- $display->handler->options_summary($buckets, $options);
+ $display->handler->optionsSummary($buckets, $options);
// Place each option into its bucket.
foreach ($options as $id => $option) {
@@ -1725,12 +1725,12 @@ function views_ui_edit_form_get_build_from_option($id, $option, $view, $display)
$option_build['#description'] = $option['title'];
- $option_build['#link'] = $display->handler->option_link($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']);
+ $option_build['#link'] = $display->handler->optionLink($option['value'], $id, '', empty($option['desc']) ? '' : $option['desc']);
$option_build['#links'] = array();
if (!empty($option['links']) && is_array($option['links'])) {
foreach ($option['links'] as $link_id => $link_value) {
- $option_build['#settings_links'][] = $display->handler->option_link($option['setting'], $link_id, 'views-button-configure', $link_value);
+ $option_build['#settings_links'][] = $display->handler->optionLink($option['setting'], $link_id, 'views-button-configure', $link_value);
}
}
@@ -1740,8 +1740,8 @@ function views_ui_edit_form_get_build_from_option($id, $option, $view, $display)
}
else {
$display_id = $display->id;
- if (!$display->handler->is_default_display()) {
- if ($display->handler->defaultable_sections($id)) {
+ if (!$display->handler->isDefaultDisplay()) {
+ if ($display->handler->defaultableSections($id)) {
$option_build['#overridden'] = TRUE;
}
}
@@ -2013,21 +2013,21 @@ function views_ui_import_validate($form, &$form_state) {
continue;
}
- $plugin = views_get_plugin('style', $display->handler->get_option('style_plugin'));
+ $plugin = views_get_plugin('style', $display->handler->getOption('style_plugin'));
if (!$plugin) {
- drupal_set_message(t('Style plugin @plugin is not available.', array('@plugin' => $display->handler->get_option('style_plugin'))), 'error');
+ drupal_set_message(t('Style plugin @plugin is not available.', array('@plugin' => $display->handler->getOption('style_plugin'))), 'error');
$broken = TRUE;
}
elseif ($plugin->usesRowPlugin()) {
- $plugin = views_get_plugin('row', $display->handler->get_option('row_plugin'));
+ $plugin = views_get_plugin('row', $display->handler->getOption('row_plugin'));
if (!$plugin) {
- drupal_set_message(t('Row plugin @plugin is not available.', array('@plugin' => $display->handler->get_option('row_plugin'))), 'error');
+ drupal_set_message(t('Row plugin @plugin is not available.', array('@plugin' => $display->handler->getOption('row_plugin'))), 'error');
$broken = TRUE;
}
}
foreach (View::viewsObjectTypes() as $type => $info) {
- $handlers = $display->handler->get_handlers($type);
+ $handlers = $display->handler->getHandlers($type);
if ($handlers) {
foreach ($handlers as $id => $handler) {
if ($handler->broken()) {
@@ -2172,7 +2172,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
break;
case 'field':
// Fetch the style plugin info so we know whether to list fields or not.
- $style_plugin = $display->handler->get_plugin();
+ $style_plugin = $display->handler->getPlugin();
$uses_fields = $style_plugin && $style_plugin->usesFields();
if (!$uses_fields) {
$build['fields'][] = array(
@@ -2191,7 +2191,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
// Create an array of actions to pass to theme_links
$actions = array();
- $count_handlers = count($display->handler->get_handlers($type));
+ $count_handlers = count($display->handler->getHandlers($type));
$actions['add'] = array(
'title' => t('Add'),
'href' => "admin/structure/views/nojs/add-item/$view->name/$display->id/$type",
@@ -2218,8 +2218,8 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
)
);
- if (!$display->handler->is_default_display()) {
- if (!$display->handler->is_defaulted($types[$type]['plural'])) {
+ if (!$display->handler->isDefaultDisplay()) {
+ if (!$display->handler->isDefaulted($types[$type]['plural'])) {
$build['#overridden'] = TRUE;
}
else {
@@ -2236,11 +2236,11 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
if (!isset($relationships)) {
// Get relationship labels
$relationships = array();
- // @todo: get_handlers()
- $handlers = $display->handler->get_option('relationships');
+ // @todo: getHandlers()
+ $handlers = $display->handler->getOption('relationships');
if ($handlers) {
foreach ($handlers as $id => $info) {
- $handler = $display->handler->get_handler('relationship', $id);
+ $handler = $display->handler->getHandler('relationship', $id);
$relationships[$id] = $handler->label();
}
}
@@ -2250,7 +2250,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
$groups = array();
$grouping = FALSE;
if ($type == 'filter') {
- $group_info = $view->display_handler->get_option('filter_groups');
+ $group_info = $view->display_handler->getOption('filter_groups');
// If there is only one group but it is using the "OR" filter, we still
// treat it as a group for display purposes, since we want to display the
// "OR" label next to items within the group.
@@ -2262,12 +2262,12 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
$build['fields'] = array();
- foreach ($display->handler->get_option($types[$type]['plural']) as $id => $field) {
+ foreach ($display->handler->getOption($types[$type]['plural']) as $id => $field) {
// Build the option link for this handler ("Node: ID = article").
$build['fields'][$id] = array();
$build['fields'][$id]['#theme'] = 'views_ui_display_tab_setting';
- $handler = $display->handler->get_handler($type, $id);
+ $handler = $display->handler->getHandler($type, $id);
if (empty($handler)) {
$build['fields'][$id]['#class'][] = 'broken';
$field_name = t('Broken/missing handler: @table > @field', array('@table' => $field['table'], '@field' => $field['field']));
@@ -2293,7 +2293,7 @@ function views_ui_edit_form_get_bucket($type, $view, $display) {
$build['fields'][$id]['#changed'] = TRUE;
}
- if ($display->handler->use_group_by() && $handler->use_group_by()) {
+ if ($display->handler->useGroupBy() && $handler->use_group_by()) {
$build['fields'][$id]['#settings_links'][] = l('<span class="label">' . t('Aggregation settings') . '</span>', "admin/structure/views/nojs/config-item-group/$view->name/$display->id/$type/$id", array('attributes' => array('class' => 'views-button-configure views-ajax-link', 'title' => t('Aggregation settings')), 'html' => TRUE));
}
@@ -2498,7 +2498,7 @@ function views_ui_standard_submit($form, &$form_state) {
if ($revert) {
// If it's revert just change the override and return.
$display = &$form_state['view']->display[$form_state['display_id']];
- $display->handler->options_override($form, $form_state);
+ $display->handler->optionsOverride($form, $form_state);
// Don't execute the normal submit handling but still store the changed view into cache.
views_ui_cache_set($form_state['view']);
@@ -2512,8 +2512,8 @@ function views_ui_standard_submit($form, &$form_state) {
// We were using the default display's values, but we're now overriding
// the default display and saving values specific to this display.
$display = &$form_state['view']->display[$form_state['display_id']];
- // options_override toggles the override of this section.
- $display->handler->options_override($form, $form_state);
+ // optionsOverride toggles the override of this section.
+ $display->handler->optionsOverride($form, $form_state);
$display->handler->options_submit($form, $form_state);
}
elseif (!$was_defaulted && $is_defaulted) {
@@ -2522,8 +2522,8 @@ function views_ui_standard_submit($form, &$form_state) {
// Overwrite the default display with the current form values, and make
// the current display use the new default values.
$display = &$form_state['view']->display[$form_state['display_id']];
- // options_override toggles the override of this section.
- $display->handler->options_override($form, $form_state);
+ // optionsOverride toggles the override of this section.
+ $display->handler->optionsOverride($form, $form_state);
$display->handler->options_submit($form, $form_state);
}
@@ -2592,18 +2592,18 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
$form['progress']['#weight'] = -1001;
}
- if ($current_display->handler->is_default_display()) {
+ if ($current_display->handler->isDefaultDisplay()) {
return;
}
// Determine whether any other displays have overrides for this section.
$section_overrides = FALSE;
- $section_defaulted = $current_display->handler->is_defaulted($section);
+ $section_defaulted = $current_display->handler->isDefaulted($section);
foreach ($displays as $id => $display) {
if ($id === 'default' || $id === $display_id) {
continue;
}
- if ($display->handler && !$display->handler->is_defaulted($section)) {
+ if ($display->handler && !$display->handler->isDefaulted($section)) {
$section_overrides = TRUE;
}
}
@@ -2626,7 +2626,7 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
'#title' => t('For'), // @TODO: Translators may need more context than this.
'#options' => $display_dropdown,
);
- if ($current_display->handler->is_defaulted($section)) {
+ if ($current_display->handler->isDefaulted($section)) {
$form['override']['dropdown']['#default_value'] = 'defaults';
}
else {
@@ -3261,7 +3261,7 @@ function views_ui_edit_display_form_submit($form, &$form_state) {
*/
function views_ui_edit_display_form_override($form, &$form_state) {
$display = &$form_state['view']->display[$form_state['display_id']];
- $display->handler->options_override($form, $form_state);
+ $display->handler->optionsOverride($form, $form_state);
views_ui_cache_set($form_state['view']);
$form_state['rerender'] = TRUE;
@@ -3284,7 +3284,7 @@ function views_ui_config_type_form($form, &$form_state) {
$form['#title'] = t('Configure @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'config-item';
- if ($display->handler->defaultable_sections($types[$type]['plural'])) {
+ if ($display->handler->defaultableSections($types[$type]['plural'])) {
$form_state['section'] = $types[$type]['plural'];
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
@@ -3331,7 +3331,7 @@ function views_ui_rearrange_form($form, &$form_state) {
$form['#title'] = t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';
- if ($display->handler->defaultable_sections($types[$type]['plural'])) {
+ if ($display->handler->defaultableSections($types[$type]['plural'])) {
$form_state['section'] = $types[$type]['plural'];
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
@@ -3340,12 +3340,12 @@ function views_ui_rearrange_form($form, &$form_state) {
// Get relationship labels
$relationships = array();
- foreach ($display->handler->get_handlers('relationship') as $id => $handler) {
+ foreach ($display->handler->getHandlers('relationship') as $id => $handler) {
$relationships[$id] = $handler->label();
- $handlers = $display->handler->get_option('relationships');
+ $handlers = $display->handler->getOption('relationships');
if ($handlers) {
foreach ($handlers as $id => $info) {
- $handler = $display->handler->get_handler('relationship', $id);
+ $handler = $display->handler->getHandler('relationship', $id);
$relationships[$id] = $handler->label();
}
}
@@ -3355,20 +3355,20 @@ function views_ui_rearrange_form($form, &$form_state) {
$groups = array();
$grouping = FALSE;
if ($type == 'filter') {
- $group_info = $view->display_handler->get_option('filter_groups');
+ $group_info = $view->display_handler->getOption('filter_groups');
if (!empty($group_info['groups']) && count($group_info['groups']) > 1) {
$grouping = TRUE;
$groups = array(0 => array());
}
}
- foreach ($display->handler->get_option($types[$type]['plural']) as $id => $field) {
+ foreach ($display->handler->getOption($types[$type]['plural']) as $id => $field) {
$form['fields'][$id] = array('#tree' => TRUE);
$form['fields'][$id]['weight'] = array(
'#type' => 'textfield',
'#default_value' => ++$count,
);
- $handler = $display->handler->get_handler($type, $id);
+ $handler = $display->handler->getHandler($type, $id);
if ($handler) {
$name = $handler->ui_name() . ' ' . $handler->admin_summary();
if (!empty($field['relationship']) && !empty($relationships[$field['relationship']])) {
@@ -3558,7 +3558,7 @@ function views_ui_rearrange_form_submit($form, &$form_state) {
$types = View::viewsObjectTypes();
$display = &$form_state['view']->display[$form_state['display_id']];
- $old_fields = $display->handler->get_option($types[$form_state['type']]['plural']);
+ $old_fields = $display->handler->getOption($types[$form_state['type']]['plural']);
$new_fields = $order = array();
// Make an array with the weights
@@ -3577,7 +3577,7 @@ function views_ui_rearrange_form_submit($form, &$form_state) {
foreach (array_keys($order) as $field) {
$new_fields[$field] = $old_fields[$field];
}
- $display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
+ $display->handler->setOption($types[$form_state['type']]['plural'], $new_fields);
// Store in cache
views_ui_cache_set($form_state['view']);
@@ -3600,7 +3600,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$form['#title'] .= t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
$form['#section'] = $display_id . 'rearrange-item';
- if ($display->handler->defaultable_sections($types[$type]['plural'])) {
+ if ($display->handler->defaultableSections($types[$type]['plural'])) {
$form_state['section'] = $types[$type]['plural'];
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
@@ -3610,14 +3610,14 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$handlers = $view->form_cache['handlers'];
}
else {
- $groups = $display->handler->get_option('filter_groups');
- $handlers = $display->handler->get_option($types[$type]['plural']);
+ $groups = $display->handler->getOption('filter_groups');
+ $handlers = $display->handler->getOption($types[$type]['plural']);
}
$count = 0;
// Get relationship labels
$relationships = array();
- foreach ($display->handler->get_handlers('relationship') as $id => $handler) {
+ foreach ($display->handler->getHandlers('relationship') as $id => $handler) {
$relationships[$id] = $handler->label();
}
@@ -3685,7 +3685,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$form['#group_options'] = $group_options;
$form['#groups'] = $groups;
- // We don't use get_handlers() because we want items without handlers to
+ // We don't use getHandlers() because we want items without handlers to
// appear and show up as 'broken' so that the user can see them.
$form['filters'] = array('#tree' => TRUE);
foreach ($handlers as $id => $field) {
@@ -3694,7 +3694,7 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
$field['group'] = 1;
}
- $handler = $display->handler->get_handler($type, $id);
+ $handler = $display->handler->getHandler($type, $id);
if ($grouping && $handler && !$handler->can_group()) {
$field['group'] = 'ungroupable';
}
@@ -3865,7 +3865,7 @@ function views_ui_rearrange_filter_form_submit($form, &$form_state) {
$old_fields = $form_state['view']->form_cache['handlers'];
}
else {
- $old_fields = $display->handler->get_option($types[$form_state['type']]['plural']);
+ $old_fields = $display->handler->getOption($types[$form_state['type']]['plural']);
}
$count = 0;
@@ -3949,8 +3949,8 @@ function views_ui_rearrange_filter_form_submit($form, &$form_state) {
}
// Write the changed handler values.
- $display->handler->set_option($types[$form_state['type']]['plural'], $new_fields);
- $display->handler->set_option('filter_groups', $groups);
+ $display->handler->setOption($types[$form_state['type']]['plural'], $new_fields);
+ $display->handler->setOption('filter_groups', $groups);
if (isset($form_state['view']->form_cache)) {
unset($form_state['view']->form_cache);
}
@@ -3996,7 +3996,7 @@ function views_ui_add_item_form($form, &$form_state) {
// Figure out all the base tables allowed based upon what the relationships provide.
$base_tables = $view->getBaseTables();
- $options = views_fetch_fields(array_keys($base_tables), $type, $display->handler->use_group_by());
+ $options = views_fetch_fields(array_keys($base_tables), $type, $display->handler->useGroupBy());
if (!empty($options)) {
$form['options']['controls'] = array(
@@ -4105,8 +4105,8 @@ function views_ui_add_item_form_submit($form, &$form_state) {
// We were using the default display's values, but we're now overriding
// the default display and saving values specific to this display.
$display = &$form_state['view']->display[$form_state['display_id']];
- // set_override toggles the override of this section.
- $display->handler->set_override($section);
+ // setOverride toggles the override of this section.
+ $display->handler->setOverride($section);
}
elseif (!$was_defaulted && $is_defaulted) {
// We used to have an override for this display, but the user now wants
@@ -4114,8 +4114,8 @@ function views_ui_add_item_form_submit($form, &$form_state) {
// Overwrite the default display with the current form values, and make
// the current display use the new default values.
$display = &$form_state['view']->display[$form_state['display_id']];
- // options_override toggles the override of this section.
- $display->handler->set_override($section);
+ // optionsOverride toggles the override of this section.
+ $display->handler->setOverride($section);
}
if (!empty($form_state['values']['name']) && is_array($form_state['values']['name'])) {
@@ -4135,7 +4135,7 @@ function views_ui_add_item_form_submit($form, &$form_state) {
$key = $types[$type]['type'];
}
$handler = views_get_handler($table, $field, $key);
- if ($form_state['view']->display_handler->use_group_by() && $handler->use_group_by()) {
+ if ($form_state['view']->display_handler->useGroupBy() && $handler->use_group_by()) {
views_ui_add_form_to_stack('config-item-group', $form_state['view'], $form_state['display_id'], array($type, $id));
}
@@ -4218,7 +4218,7 @@ function views_ui_config_item_form($form, &$form_state) {
$item = $view->get_item($display_id, $type, $id);
if ($item) {
- $handler = $view->display_handler->get_handler($type, $id);
+ $handler = $view->display_handler->getHandler($type, $id);
if (empty($handler)) {
$form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
@@ -4227,14 +4227,14 @@ function views_ui_config_item_form($form, &$form_state) {
// If this item can come from the default display, show a dropdown
// that lets the user choose which display the changes should apply to.
- if ($view->display_handler->defaultable_sections($types[$type]['plural'])) {
+ if ($view->display_handler->defaultableSections($types[$type]['plural'])) {
$form_state['section'] = $types[$type]['plural'];
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
// A whole bunch of code to figure out what relationships are valid for
// this item.
- $relationships = $view->display_handler->get_option('relationships');
+ $relationships = $view->display_handler->getOption('relationships');
$relationship_options = array();
foreach ($relationships as $relationship) {
@@ -4252,7 +4252,7 @@ function views_ui_config_item_form($form, &$form_state) {
// If this relationship is valid for this type, add it to the list.
$data = views_fetch_data($relationship['table']);
$base = $data[$relationship['field']]['relationship']['base'];
- $base_fields = views_fetch_fields($base, $form_state['type'], $view->display_handler->use_group_by());
+ $base_fields = views_fetch_fields($base, $form_state['type'], $view->display_handler->useGroupBy());
if (isset($base_fields[$item['table'] . '.' . $item['field']])) {
$relationship_handler->init($view, $relationship);
$relationship_options[$relationship['id']] = $relationship_handler->label();
@@ -4262,7 +4262,7 @@ function views_ui_config_item_form($form, &$form_state) {
if (!empty($relationship_options)) {
// Make sure the existing relationship is even valid. If not, force
// it to none.
- $base_fields = views_fetch_fields($view->base_table, $form_state['type'], $view->display_handler->use_group_by());
+ $base_fields = views_fetch_fields($view->base_table, $form_state['type'], $view->display_handler->useGroupBy());
if (isset($base_fields[$item['table'] . '.' . $item['field']])) {
$relationship_options = array_merge(array('none' => t('Do not use a relationship')), $relationship_options);
}
@@ -4353,7 +4353,7 @@ function views_ui_config_item_form_submit_temporary($form, &$form_state) {
}
$override = NULL;
- if ($form_state['view']->display_handler->use_group_by() && !empty($item['group_type'])) {
+ if ($form_state['view']->display_handler->useGroupBy() && !empty($item['group_type'])) {
if (empty($form_state['view']->query)) {
$form_state['view']->initQuery();
}
@@ -4407,7 +4407,7 @@ function views_ui_config_item_form_submit($form, &$form_state) {
}
$override = NULL;
- if ($form_state['view']->display_handler->use_group_by() && !empty($item['group_type'])) {
+ if ($form_state['view']->display_handler->useGroupBy() && !empty($item['group_type'])) {
if (empty($form_state['view']->query)) {
$form_state['view']->initQuery();
}
@@ -4467,7 +4467,7 @@ function views_ui_config_item_group_form($type, &$form_state) {
$item = $view->get_item($display_id, $type, $id);
if ($item) {
- $handler = $view->display_handler->get_handler($type, $id);
+ $handler = $view->display_handler->getHandler($type, $id);
if (empty($handler)) {
$form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
@@ -4515,7 +4515,7 @@ function views_ui_config_item_form_remove($form, &$form_state) {
// If the display selection was changed toggle the override value.
if ($was_defaulted != $is_defaulted) {
$display =& $form_state['view']->display[$form_state['display_id']];
- $display->handler->options_override($form, $form_state);
+ $display->handler->optionsOverride($form, $form_state);
}
$form_state['view']->set_item($form_state['display_id'], $form_state['type'], $form_state['id'], NULL);
@@ -4568,7 +4568,7 @@ function views_ui_config_item_extra_form($form, &$form_state) {
$item = $view->get_item($display_id, $type, $id);
if ($item) {
- $handler = $view->display_handler->get_handler($type, $id);
+ $handler = $view->display_handler->getHandler($type, $id);
if (empty($handler)) {
$form['markup'] = array('#markup' => t("Error: handler for @table > @field doesn't exist!", array('@table' => $item['table'], '@field' => $item['field'])));
}
diff --git a/includes/ajax.inc b/includes/ajax.inc
index 00f87e7cd9d0..f4e110f8a0fb 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -67,7 +67,7 @@ function views_ajax() {
// Override the display's pager_element with the one actually used.
if (isset($pager_element)) {
$commands[] = views_ajax_command_scroll_top('.view-dom-id-' . $dom_id);
- $view->display[$display_id]->handler->set_option('pager_element', $pager_element);
+ $view->display[$display_id]->handler->setOption('pager_element', $pager_element);
}
// Reuse the same DOM id so it matches that in Drupal.settings.
$view->dom_id = $dom_id;
diff --git a/includes/analyze.inc b/includes/analyze.inc
index 70d62c0fa16e..e650c4a8b13a 100644
--- a/includes/analyze.inc
+++ b/includes/analyze.inc
@@ -27,7 +27,7 @@ function views_ui_views_analyze($view) {
if (empty($display->handler)) {
continue;
}
- if ($display->handler->has_path() && $path = $display->handler->get_option('path')) {
+ if ($display->handler->hasPath() && $path = $display->handler->getOption('path')) {
$normal_path = drupal_get_normal_path($path);
if ($path != $normal_path) {
$ret[] = Analyzer::formatMessage(t('You have configured display %display with a path which is an path alias as well. This might lead to unwanted effects so better use an internal path.', array('%display' => $display->display_title)), 'warning');
diff --git a/lib/Drupal/views/Plugin/views/HandlerBase.php b/lib/Drupal/views/Plugin/views/HandlerBase.php
index 9d963f3a3c83..bb855eadd008 100644
--- a/lib/Drupal/views/Plugin/views/HandlerBase.php
+++ b/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -99,7 +99,7 @@ function init(&$view, &$options) {
if (isset($types[$this->plugin_type]['plural'])) {
$plural = $types[$this->plugin_type]['plural'];
}
- if ($this->view->display_handler->is_defaulted($plural)) {
+ if ($this->view->display_handler->isDefaulted($plural)) {
$display_id = 'default';
}
@@ -178,7 +178,7 @@ function get_field($field = NULL) {
}
// If grouping, check to see if the aggregation method needs to modify the field.
- if ($this->view->display_handler->use_group_by()) {
+ if ($this->view->display_handler->useGroupBy()) {
$this->view->initQuery();
if ($this->query) {
$info = $this->query->get_aggregation_info();
diff --git a/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
index 1e1180b2e1cc..dcc7ae559963 100644
--- a/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
@@ -35,7 +35,7 @@ function init(&$view, &$display) {
$this->display = &$display;
if (is_object($display->handler)) {
- $options = $display->handler->get_option('access');
+ $options = $display->handler->getOption('access');
// Overlay incoming options on top of defaults
$this->unpack_options($this->options, $options);
}
diff --git a/lib/Drupal/views/Plugin/views/area/Text.php b/lib/Drupal/views/Plugin/views/area/Text.php
index e7b8fc14099a..14f975ab7f57 100644
--- a/lib/Drupal/views/Plugin/views/area/Text.php
+++ b/lib/Drupal/views/Plugin/views/area/Text.php
@@ -48,12 +48,12 @@ function options_form(&$form, &$form_state) {
// Get a list of the available fields and arguments for token replacement.
$options = array();
- foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
+ foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
$options[t('Fields')]["[$field]"] = $handler->ui_name();
}
$count = 0; // This lets us prepare the key as we want it printed.
- foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
$options[t('Arguments')]['%' . ++$count] = t('@argument title', array('@argument' => $handler->ui_name()));
$options[t('Arguments')]['!' . $count] = t('@argument input', array('@argument' => $handler->ui_name()));
}
diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index c621122a67d3..8d5a73771431 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -160,7 +160,7 @@ function option_definition() {
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $argument_text = $this->view->display_handler->get_argument_text();
+ $argument_text = $this->view->display_handler->getArgumentText();
$form['#pre_render'][] = 'views_ui_pre_render_move_argument_options';
@@ -479,7 +479,7 @@ function default_actions($which = NULL) {
),
);
- if ($this->view->display_handler->has_path()) {
+ if ($this->view->display_handler->hasPath()) {
$defaults['not found']['title'] = t('Show "Page not found"');
}
@@ -851,7 +851,7 @@ function summary_name_field() {
*/
function summary_basics($count_field = TRUE) {
// Add the number of nodes counter
- $distinct = ($this->view->display_handler->get_option('distinct') && empty($this->query->no_distinct));
+ $distinct = ($this->view->display_handler->getOption('distinct') && empty($this->query->no_distinct));
$count_alias = $this->query->add_field($this->query->base_table, $this->query->base_field, 'num_records', array('count' => TRUE, 'distinct' => $distinct));
$this->query->add_groupby($this->name_alias);
diff --git a/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index 46a761e4d840..7039e7b8bc7a 100644
--- a/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -64,7 +64,7 @@ function init(&$view, &$display) {
$this->display = &$display;
if (is_object($display->handler)) {
- $options = $display->handler->get_option('cache');
+ $options = $display->handler->getOption('cache');
// Overlay incoming options on top of defaults
$this->unpack_options($this->options, $options);
}
@@ -274,7 +274,7 @@ function get_results_key() {
$build_info = $this->view->build_info;
- $query_plugin = $this->view->display_handler->get_plugin('query');
+ $query_plugin = $this->view->display_handler->getPlugin('query');
foreach (array('query', 'count_query') as $index) {
// If the default query back-end is used generate SQL query strings from
diff --git a/lib/Drupal/views/Plugin/views/display/Attachment.php b/lib/Drupal/views/Plugin/views/display/Attachment.php
index f4c4effa85aa..6320a00cbad3 100644
--- a/lib/Drupal/views/Plugin/views/display/Attachment.php
+++ b/lib/Drupal/views/Plugin/views/display/Attachment.php
@@ -49,11 +49,11 @@ function option_definition() {
return $options;
}
- function execute() {
+ public function execute() {
return $this->view->render($this->display->id);
}
- function attachment_positions($position = NULL) {
+ public function attachmentPositions($position = NULL) {
$positions = array(
'before' => t('Before'),
'after' => t('After'),
@@ -72,9 +72,9 @@ function attachment_positions($position = NULL) {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function optionsSummary(&$categories, &$options) {
// It is very important to call the parent function here:
- parent::options_summary($categories, $options);
+ parent::optionsSummary($categories, $options);
$categories['attachment'] = array(
'title' => t('Attachment settings'),
@@ -84,7 +84,7 @@ function options_summary(&$categories, &$options) {
),
);
- $displays = array_filter($this->get_option('displays'));
+ $displays = array_filter($this->getOption('displays'));
if (count($displays) > 1) {
$attach_to = t('Multiple displays');
}
@@ -108,31 +108,31 @@ function options_summary(&$categories, &$options) {
$options['attachment_position'] = array(
'category' => 'attachment',
'title' => t('Attachment position'),
- 'value' => $this->attachment_positions($this->get_option('attachment_position')),
+ 'value' => $this->attachmentPositions($this->getOption('attachment_position')),
);
$options['inherit_arguments'] = array(
'category' => 'attachment',
'title' => t('Inherit contextual filters'),
- 'value' => $this->get_option('inherit_arguments') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('inherit_arguments') ? t('Yes') : t('No'),
);
$options['inherit_exposed_filters'] = array(
'category' => 'attachment',
'title' => t('Inherit exposed filters'),
- 'value' => $this->get_option('inherit_exposed_filters') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('inherit_exposed_filters') ? t('Yes') : t('No'),
);
$options['inherit_pager'] = array(
'category' => 'pager',
'title' => t('Inherit pager'),
- 'value' => $this->get_option('inherit_pager') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('inherit_pager') ? t('Yes') : t('No'),
);
$options['render_pager'] = array(
'category' => 'pager',
'title' => t('Render pager'),
- 'value' => $this->get_option('render_pager') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('render_pager') ? t('Yes') : t('No'),
);
}
@@ -140,7 +140,7 @@ function options_summary(&$categories, &$options) {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
@@ -151,7 +151,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Inherit'),
'#description' => t('Should this display inherit its contextual filter values from the parent display to which it is attached?'),
- '#default_value' => $this->get_option('inherit_arguments'),
+ '#default_value' => $this->getOption('inherit_arguments'),
);
break;
case 'inherit_exposed_filters':
@@ -160,7 +160,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Inherit'),
'#description' => t('Should this display inherit its exposed filter values from the parent display to which it is attached?'),
- '#default_value' => $this->get_option('inherit_exposed_filters'),
+ '#default_value' => $this->getOption('inherit_exposed_filters'),
);
break;
case 'inherit_pager':
@@ -169,7 +169,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Inherit'),
'#description' => t('Should this display inherit its paging values from the parent display to which it is attached?'),
- '#default_value' => $this->get_option('inherit_pager'),
+ '#default_value' => $this->getOption('inherit_pager'),
);
break;
case 'render_pager':
@@ -178,7 +178,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Render'),
'#description' => t('Should this display render the pager values? This is only meaningful if inheriting a pager.'),
- '#default_value' => $this->get_option('render_pager'),
+ '#default_value' => $this->getOption('render_pager'),
);
break;
case 'attachment_position':
@@ -186,8 +186,8 @@ function options_form(&$form, &$form_state) {
$form['attachment_position'] = array(
'#type' => 'radios',
'#description' => t('Attach before or after the parent display?'),
- '#options' => $this->attachment_positions(),
- '#default_value' => $this->get_option('attachment_position'),
+ '#options' => $this->attachmentPositions(),
+ '#default_value' => $this->getOption('attachment_position'),
);
break;
case 'displays':
@@ -202,7 +202,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkboxes',
'#description' => t('Select which display or displays this should attach to.'),
'#options' => $displays,
- '#default_value' => $this->get_option('displays'),
+ '#default_value' => $this->getOption('displays'),
);
break;
}
@@ -212,7 +212,7 @@ function options_form(&$form, &$form_state) {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
@@ -222,7 +222,7 @@ function options_submit(&$form, &$form_state) {
case 'inherit_exposed_filters':
case 'attachment_position':
case 'displays':
- $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
+ $this->setOption($form_state['section'], $form_state['values'][$form_state['section']]);
break;
}
}
@@ -230,8 +230,8 @@ function options_submit(&$form, &$form_state) {
/**
* Attach to another view.
*/
- function attach_to($display_id) {
- $displays = $this->get_option('displays');
+ public function attachTo($display_id) {
+ $displays = $this->getOption('displays');
if (empty($displays[$display_id])) {
return;
@@ -246,17 +246,17 @@ function attach_to($display_id) {
$view = $this->view->cloneView();
$view->original_args = $view->args;
- $args = $this->get_option('inherit_arguments') ? $this->view->args : array();
+ $args = $this->getOption('inherit_arguments') ? $this->view->args : array();
$view->setArguments($args);
$view->setDisplay($this->display->id);
- if ($this->get_option('inherit_pager')) {
+ if ($this->getOption('inherit_pager')) {
$view->display_handler->usesPager = $this->view->display[$display_id]->handler->usesPager();
- $view->display_handler->set_option('pager', $this->view->display[$display_id]->handler->get_option('pager'));
+ $view->display_handler->setOption('pager', $this->view->display[$display_id]->handler->getOption('pager'));
}
$attachment = $view->executeDisplay($this->display->id, $args);
- switch ($this->get_option('attachment_position')) {
+ switch ($this->getOption('attachment_position')) {
case 'before':
$this->view->attachment_before .= $attachment;
break;
@@ -277,8 +277,8 @@ function attach_to($display_id) {
* they are set to inherit the exposed filter settings
* of their parent display.
*/
- function uses_exposed() {
- if (!empty($this->options['inherit_exposed_filters']) && parent::uses_exposed()) {
+ public function usesExposed() {
+ if (!empty($this->options['inherit_exposed_filters']) && parent::usesExposed()) {
return TRUE;
}
return FALSE;
@@ -289,12 +289,12 @@ function uses_exposed() {
* settings from its parent display, then don't render and
* display a second set of exposed filter widgets.
*/
- function displays_exposed() {
+ public function displaysExposed() {
return $this->options['inherit_exposed_filters'] ? FALSE : TRUE;
}
- function render_pager() {
- return $this->usesPager() && $this->get_option('render_pager');
+ public function renderPager() {
+ return $this->usesPager() && $this->getOption('render_pager');
}
}
diff --git a/lib/Drupal/views/Plugin/views/display/Block.php b/lib/Drupal/views/Plugin/views/display/Block.php
index 28d5f6ede133..c21cf5e90c38 100644
--- a/lib/Drupal/views/Plugin/views/display/Block.php
+++ b/lib/Drupal/views/Plugin/views/display/Block.php
@@ -48,9 +48,9 @@ function option_definition() {
* but extended block handlers might be able to do interesting
* stuff with it.
*/
- function execute_hook_block_list($delta = 0, $edit = array()) {
+ public function executeHookBlockList($delta = 0, $edit = array()) {
$delta = $this->view->name . '-' . $this->display->id;
- $desc = $this->get_option('block_description');
+ $desc = $this->getOption('block_description');
if (empty($desc)) {
if ($this->display->display_title == $this->definition['title']) {
@@ -63,7 +63,7 @@ function execute_hook_block_list($delta = 0, $edit = array()) {
return array(
$delta => array(
'info' => $desc,
- 'cache' => $this->get_cache_type()
+ 'cache' => $this->getCacheType()
),
);
}
@@ -71,12 +71,12 @@ function execute_hook_block_list($delta = 0, $edit = array()) {
/**
* The display block handler returns the structure necessary for a block.
*/
- function execute() {
+ public function execute() {
// Prior to this being called, the $view should already be set to this
// display, and arguments should be set on the view.
$info['content'] = $this->view->render();
$info['subject'] = filter_xss_admin($this->view->getTitle());
- if (!empty($this->view->result) || $this->get_option('empty') || !empty($this->view->style_plugin->definition['even empty'])) {
+ if (!empty($this->view->result) || $this->getOption('empty') || !empty($this->view->style_plugin->definition['even empty'])) {
return $info;
}
}
@@ -86,9 +86,9 @@ function execute() {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function optionsSummary(&$categories, &$options) {
// It is very important to call the parent function here:
- parent::options_summary($categories, $options);
+ parent::optionsSummary($categories, $options);
$categories['block'] = array(
'title' => t('Block settings'),
@@ -98,7 +98,7 @@ function options_summary(&$categories, &$options) {
),
);
- $block_description = strip_tags($this->get_option('block_description'));
+ $block_description = strip_tags($this->getOption('block_description'));
if (empty($block_description)) {
$block_description = t('None');
}
@@ -109,18 +109,18 @@ function options_summary(&$categories, &$options) {
'value' => views_ui_truncate($block_description, 24),
);
- $types = $this->block_caching_modes();
+ $types = $this->blockCachingModes();
$options['block_caching'] = array(
'category' => 'other',
'title' => t('Block caching'),
- 'value' => $types[$this->get_cache_type()],
+ 'value' => $types[$this->getCacheType()],
);
}
/**
* Provide a list of core's block caching modes.
*/
- function block_caching_modes() {
+ protected function blockCachingModes() {
return array(
DRUPAL_NO_CACHE => t('Do not cache'),
DRUPAL_CACHE_GLOBAL => t('Cache once for everything (global)'),
@@ -136,8 +136,8 @@ function block_caching_modes() {
* Provide a single method to figure caching type, keeping a sensible default
* for when it's unset.
*/
- function get_cache_type() {
- $cache_type = $this->get_option('block_caching');
+ protected function getCacheType() {
+ $cache_type = $this->getOption('block_caching');
if (empty($cache_type)) {
$cache_type = DRUPAL_NO_CACHE;
}
@@ -147,7 +147,7 @@ function get_cache_type() {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
@@ -157,7 +157,7 @@ function options_form(&$form, &$form_state) {
$form['block_description'] = array(
'#type' => 'textfield',
'#description' => t('This will appear as the name of this block in administer >> structure >> blocks.'),
- '#default_value' => $this->get_option('block_description'),
+ '#default_value' => $this->getOption('block_description'),
);
break;
case 'block_caching':
@@ -166,13 +166,13 @@ function options_form(&$form, &$form_state) {
$form['block_caching'] = array(
'#type' => 'radios',
'#description' => t("This sets the default status for Drupal's built-in block caching method; this requires that caching be turned on in block administration, and be careful because you have little control over when this cache is flushed."),
- '#options' => $this->block_caching_modes(),
- '#default_value' => $this->get_cache_type(),
+ '#options' => $this->blockCachingModes(),
+ '#default_value' => $this->getCacheType(),
);
break;
case 'exposed_form_options':
$this->view->initHandlers();
- if (!$this->uses_exposed() && parent::uses_exposed()) {
+ if (!$this->usesExposed() && parent::usesExposed()) {
$form['exposed_form_options']['warning'] = array(
'#weight' => -10,
'#markup' => '<div class="messages warning">' . t('Exposed filters in block displays require "Use AJAX" to be set to work correctly.') . '</div>',
@@ -185,19 +185,19 @@ function options_form(&$form, &$form_state) {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
case 'display_id':
- $this->update_block_bid($form_state['view']->name, $this->display->id, $this->display->new_id);
+ $this->updateBlockBid($form_state['view']->name, $this->display->id, $this->display->new_id);
break;
case 'block_description':
- $this->set_option('block_description', $form_state['values']['block_description']);
+ $this->setOption('block_description', $form_state['values']['block_description']);
break;
case 'block_caching':
- $this->set_option('block_caching', $form_state['values']['block_caching']);
- $this->save_block_cache($form_state['view']->name . '-'. $form_state['display_id'], $form_state['values']['block_caching']);
+ $this->setOption('block_caching', $form_state['values']['block_caching']);
+ $this->saveBlockCache($form_state['view']->name . '-'. $form_state['display_id'], $form_state['values']['block_caching']);
break;
}
}
@@ -205,9 +205,9 @@ function options_submit(&$form, &$form_state) {
/**
* Block views use exposed widgets only if AJAX is set.
*/
- function uses_exposed() {
+ public function usesExposed() {
if ($this->isAJAXEnabled()) {
- return parent::uses_exposed();
+ return parent::usesExposed();
}
return FALSE;
}
@@ -215,7 +215,7 @@ function uses_exposed() {
/**
* Update the block delta when you change the machine readable name of the display.
*/
- function update_block_bid($name, $old_delta, $delta) {
+ protected function updateBlockBid($name, $old_delta, $delta) {
$old_hashes = $hashes = variable_get('views_block_hashes', array());
$old_delta = $name . '-' . $old_delta;
@@ -248,7 +248,7 @@ function update_block_bid($name, $old_delta, $delta) {
* Save the block cache setting in the blocks table if this block allready
* exists in the blocks table. Dirty fix untill http://drupal.org/node/235673 gets in.
*/
- function save_block_cache($delta, $cache_setting) {
+ protected function saveBlockCache($delta, $cache_setting) {
if (strlen($delta) >= 32) {
$delta = md5($delta);
}
diff --git a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
index 4d2cd4058e65..7a0cfce67e27 100644
--- a/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
+++ b/lib/Drupal/views/Plugin/views/display/DefaultDisplay.php
@@ -36,7 +36,7 @@ class DefaultDisplay extends DisplayPluginBase {
* Determine if this display is the 'default' display which contains
* fallback settings
*/
- function is_default_display() { return TRUE; }
+ public function isDefaultDisplay() { return TRUE; }
/**
* The default execute handler fully renders the view.
@@ -72,7 +72,7 @@ function is_default_display() { return TRUE; }
* as setting page titles, breadcrumbs, and generating exposed filter
* data if necessary.
*/
- function execute() {
+ public function execute() {
return $this->view->render($this->display->id);
}
diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 87fd7071a711..b9df99576c00 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -86,7 +86,7 @@ abstract class DisplayPluginBase extends PluginBase {
*/
protected $usesAttachments = FALSE;
- function init(&$view, &$display, $options = NULL) {
+ public function init(&$view, &$display, $options = NULL) {
$this->view = &$view;
$this->display = &$display;
@@ -111,7 +111,7 @@ function init(&$view, &$display, $options = NULL) {
$options = $display->display_options;
}
- if ($this->is_default_display() && isset($options['defaults'])) {
+ if ($this->isDefaultDisplay() && isset($options['defaults'])) {
unset($options['defaults']);
}
@@ -140,11 +140,11 @@ function init(&$view, &$display, $options = NULL) {
}
// Convert the field_language and field_language_add_to_query settings.
- $field_language = $this->get_option('field_language');
- $field_language_add_to_query = $this->get_option('field_language_add_to_query');
+ $field_language = $this->getOption('field_language');
+ $field_language_add_to_query = $this->getOption('field_language_add_to_query');
if (isset($field_langcode)) {
- $this->set_option('field_langcode', $field_language);
- $this->set_option('field_langcode_add_to_query', $field_language_add_to_query);
+ $this->setOption('field_langcode', $field_language);
+ $this->setOption('field_langcode_add_to_query', $field_language_add_to_query);
$changed = TRUE;
}
@@ -154,7 +154,7 @@ function init(&$view, &$display, $options = NULL) {
}
}
- function destroy() {
+ public function destroy() {
parent::destroy();
foreach ($this->handlers as $type => $handlers) {
@@ -178,13 +178,13 @@ function destroy() {
* Determine if this display is the 'default' display which contains
* fallback settings
*/
- function is_default_display() { return FALSE; }
+ public function isDefaultDisplay() { return FALSE; }
/**
* Determine if this display uses exposed filters, so the view
* will know whether or not to build them.
*/
- function uses_exposed() {
+ public function usesExposed() {
if (!isset($this->has_exposed)) {
foreach ($this->handlers as $type => $value) {
foreach ($this->view->$type as $id => $handler) {
@@ -195,7 +195,7 @@ function uses_exposed() {
}
}
}
- $pager = $this->get_plugin('pager');
+ $pager = $this->getPlugin('pager');
if (isset($pager) && $pager->uses_exposed()) {
$this->has_exposed = TRUE;
return TRUE;
@@ -213,9 +213,9 @@ function uses_exposed() {
*
* Regardless of what this function
* returns, exposed filters will not be used nor
- * displayed unless uses_exposed() returns TRUE.
+ * displayed unless usesExposed() returns TRUE.
*/
- function displays_exposed() {
+ public function displaysExposed() {
return TRUE;
}
@@ -224,7 +224,7 @@ function displays_exposed() {
*
* @return bool
*/
- function usesAJAX() {
+ public function usesAJAX() {
return $this->usesAJAX;
}
@@ -233,9 +233,9 @@ function usesAJAX() {
*
* @return bool
*/
- function isAJAXEnabled() {
+ public function isAJAXEnabled() {
if ($this->usesAJAX()) {
- return $this->get_option('use_ajax');
+ return $this->getOption('use_ajax');
}
return FALSE;
}
@@ -246,7 +246,7 @@ function isAJAXEnabled() {
* @return bool
*/
- function usesPager() {
+ public function usesPager() {
return $this->usesPager;
}
@@ -255,9 +255,9 @@ function usesPager() {
*
* @return bool
*/
- function isPagerEnabled() {
+ public function isPagerEnabled() {
if ($this->usesPager()) {
- $pager = $this->get_plugin('pager');
+ $pager = $this->getPlugin('pager');
if ($pager) {
return $pager->use_pager();
}
@@ -270,7 +270,7 @@ function isPagerEnabled() {
*
* @return bool
*/
- function usesMore() {
+ public function usesMore() {
return $this->usesMore;
}
@@ -279,9 +279,9 @@ function usesMore() {
*
* @return bool
*/
- function isMoreEnabled() {
+ public function isMoreEnabled() {
if ($this->usesMore()) {
- return $this->get_option('use_more');
+ return $this->getOption('use_more');
}
return FALSE;
}
@@ -289,16 +289,16 @@ function isMoreEnabled() {
/**
* Does the display have groupby enabled?
*/
- function use_group_by() {
- return $this->get_option('group_by');
+ public function useGroupBy() {
+ return $this->getOption('group_by');
}
/**
* Should the enabled display more link be shown when no more items?
*/
- function use_more_always() {
+ public function useMoreAlways() {
if ($this->usesMore()) {
- return $this->get_option('use_more_always');
+ return $this->getOption('useMoreAlways');
}
return FALSE;
}
@@ -306,9 +306,9 @@ function use_more_always() {
/**
* Does the display have custom link text?
*/
- function use_more_text() {
+ public function useMoreText() {
if ($this->usesMore()) {
- return $this->get_option('use_more_text');
+ return $this->getOption('useMoreText');
}
return FALSE;
}
@@ -318,11 +318,11 @@ function use_more_text() {
*
* @return bool
*/
- function acceptAttachments() {
+ public function acceptAttachments() {
if (!$this->usesAttachments()) {
return FALSE;
}
- if (!empty($this->view->argument) && $this->get_option('hide_attachment_summary')) {
+ if (!empty($this->view->argument) && $this->getOption('hide_attachment_summary')) {
foreach ($this->view->argument as $argument_id => $argument) {
if ($argument->needs_style_plugin() && empty($argument->argument_validated)) {
return FALSE;
@@ -337,20 +337,20 @@ function acceptAttachments() {
*
* @return bool
*/
- function usesAttachments() {
+ public function usesAttachments() {
return $this->usesAttachments;
}
/**
* Allow displays to attach to other views.
*/
- function attach_to($display_id) { }
+ public function attachTo($display_id) { }
/**
* Static member function to list which sections are defaultable
* and what items each section contains.
*/
- function defaultable_sections($section = NULL) {
+ public function defaultableSections($section = NULL) {
$sections = array(
'access' => array('access', 'access_options'),
'access_options' => array('access', 'access_options'),
@@ -399,7 +399,7 @@ function defaultable_sections($section = NULL) {
}
foreach ($this->extender as $extender) {
- $extender->defaultable_sections($sections, $section);
+ $extender->defaultableSections($sections, $section);
}
if ($section) {
@@ -412,7 +412,7 @@ function defaultable_sections($section = NULL) {
}
}
- function option_definition() {
+ public function option_definition() {
$options = array(
'defaults' => array(
'default' => array(
@@ -524,17 +524,17 @@ function option_definition() {
// and therefore need special handling.
'access' => array(
'contains' => array(
- 'type' => array('default' => 'none', 'export' => 'export_plugin', 'unpack_translatable' => 'unpack_plugin'),
+ 'type' => array('default' => 'none', 'export' => 'exportPlugin', 'unpack_translatable' => 'unpackPlugin'),
),
),
'cache' => array(
'contains' => array(
- 'type' => array('default' => 'none', 'export' => 'export_plugin', 'unpack_translatable' => 'unpack_plugin'),
+ 'type' => array('default' => 'none', 'export' => 'exportPlugin', 'unpack_translatable' => 'unpackPlugin'),
),
),
'query' => array(
'contains' => array(
- 'type' => array('default' => 'views_query', 'export' => 'export_plugin'),
+ 'type' => array('default' => 'views_query', 'export' => 'exportPlugin'),
'options' => array('default' => array(), 'export' => FALSE),
),
),
@@ -546,13 +546,13 @@ function option_definition() {
// should be copied.
'exposed_form' => array(
'contains' => array(
- 'type' => array('default' => 'basic', 'export' => 'export_plugin', 'unpack_translatable' => 'unpack_plugin'),
+ 'type' => array('default' => 'basic', 'export' => 'exportPlugin', 'unpack_translatable' => 'unpackPlugin'),
'options' => array('default' => array(), 'export' => FALSE),
),
),
'pager' => array(
'contains' => array(
- 'type' => array('default' => 'full', 'export' => 'export_plugin', 'unpack_translatable' => 'unpack_plugin'),
+ 'type' => array('default' => 'full', 'export' => 'exportPlugin', 'unpack_translatable' => 'unpackPlugin'),
'options' => array('default' => array(), 'export' => FALSE),
),
),
@@ -562,8 +562,8 @@ function option_definition() {
// should not be repeated.
'style_plugin' => array(
'default' => 'default',
- 'export' => 'export_style',
- 'unpack_translatable' => 'unpack_style',
+ 'export' => 'exportStyle',
+ 'unpack_translatable' => 'unpackStyle',
),
'style_options' => array(
'default' => array(),
@@ -571,8 +571,8 @@ function option_definition() {
),
'row_plugin' => array(
'default' => 'fields',
- 'export' => 'export_style',
- 'unpack_translatable' => 'unpack_style',
+ 'export' => 'exportStyle',
+ 'unpack_translatable' => 'unpackStyle',
),
'row_options' => array(
'default' => array(),
@@ -585,42 +585,42 @@ function option_definition() {
'header' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'footer' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'empty' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
// We want these to export last.
// These are the 5 handler types.
'relationships' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'fields' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'sorts' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'arguments' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
'filter_groups' => array(
'contains' => array(
@@ -630,8 +630,8 @@ function option_definition() {
),
'filters' => array(
'default' => array(),
- 'export' => 'export_handler',
- 'unpack_translatable' => 'unpack_handler',
+ 'export' => 'exportHandler',
+ 'unpack_translatable' => 'unpackHandler',
),
);
@@ -643,7 +643,7 @@ function option_definition() {
$options['pager']['contains']['type']['default'] = 'some';
}
- if ($this->is_default_display()) {
+ if ($this->isDefaultDisplay()) {
unset($options['defaults']);
}
@@ -663,7 +663,7 @@ function option_definition() {
*
* By default, displays do not have a path.
*/
- function has_path() { return FALSE; }
+ public function hasPath() { return FALSE; }
/**
* Check to see if the display has some need to link to another display.
@@ -672,7 +672,7 @@ function has_path() { return FALSE; }
* sometimes displays that have a path might also need to link to another display.
* This is true for feeds.
*/
- function uses_link_display() { return !$this->has_path(); }
+ public function usesLinkDisplay() { return !$this->hasPath(); }
/**
* Check to see if the display can put the exposed formin a block.
@@ -682,18 +682,18 @@ function uses_link_display() { return !$this->has_path(); }
* place to go and Views really wants the forms to go to a specific
* page.
*/
- function uses_exposed_form_in_block() { return $this->has_path(); }
+ public function usesExposedFormInBlock() { return $this->hasPath(); }
/**
* Check to see which display to use when creating links within
* a view using this display.
*/
- function get_link_display() {
- $display_id = $this->get_option('link_display');
+ public function getLinkDisplay() {
+ $display_id = $this->getOption('link_display');
// If unknown, pick the first one.
if (empty($display_id) || empty($this->view->display[$display_id])) {
foreach ($this->view->display as $display_id => $display) {
- if (!empty($display->handler) && $display->handler->has_path()) {
+ if (!empty($display->handler) && $display->handler->hasPath()) {
return $display_id;
}
}
@@ -710,18 +710,18 @@ function get_link_display() {
* This can be overridden for displays that do strange things
* with the path.
*/
- function get_path() {
- if ($this->has_path()) {
- return $this->get_option('path');
+ public function getPath() {
+ if ($this->hasPath()) {
+ return $this->getOption('path');
}
- $display_id = $this->get_link_display();
+ $display_id = $this->getLinkDisplay();
if ($display_id && !empty($this->view->display[$display_id]) && is_object($this->view->display[$display_id]->handler)) {
- return $this->view->display[$display_id]->handler->get_path();
+ return $this->view->display[$display_id]->handler->getPath();
}
}
- function get_url() {
+ public function getUrl() {
return $this->view->getUrl();
}
@@ -730,7 +730,7 @@ function get_url() {
*
* By default, displays do not need breadcrumbs
*/
- function uses_breadcrumb() { return FALSE; }
+ public function usesBreadcrumb() { return FALSE; }
/**
* Determine if a given option is set to use the default display or the
@@ -739,17 +739,17 @@ function uses_breadcrumb() { return FALSE; }
* @return
* TRUE for the default display
*/
- function is_defaulted($option) {
- return !$this->is_default_display() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
+ public function isDefaulted($option) {
+ return !$this->isDefaultDisplay() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
}
/**
* Intelligently get an option either from this display or from the
* default display, if directed to do so.
*/
- function get_option($option) {
- if ($this->is_defaulted($option)) {
- return $this->default_display->get_option($option);
+ public function getOption($option) {
+ if ($this->isDefaulted($option)) {
+ return $this->default_display->getOption($option);
}
if (array_key_exists($option, $this->options)) {
@@ -762,8 +762,8 @@ function get_option($option) {
*
* @return bool
*/
- function usesFields() {
- $plugin = $this->get_plugin('style');
+ public function usesFields() {
+ $plugin = $this->getPlugin('style');
if ($plugin) {
return $plugin->usesFields();
}
@@ -779,16 +779,16 @@ function usesFields() {
*
* @return views_plugin|FALSE
*/
- function get_plugin($type = 'style', $name = NULL) {
+ public function getPlugin($type = 'style', $name = NULL) {
static $cache = array();
if (!isset($cache[$type][$name])) {
switch ($type) {
case 'style':
case 'row':
$option_name = $type . '_plugin';
- $options = $this->get_option($type . '_options');
+ $options = $this->getOption($type . '_options');
if (!$name) {
- $name = $this->get_option($option_name);
+ $name = $this->getOption($option_name);
}
break;
@@ -797,7 +797,7 @@ function get_plugin($type = 'style', $name = NULL) {
$name = !empty($views_data['table']['base']['query class']) ? $views_data['table']['base']['query class'] : 'views_query';
default:
$option_name = $type;
- $options = $this->get_option($type);
+ $options = $this->getOption($type);
if (!$name) {
$name = $options['type'];
}
@@ -828,7 +828,7 @@ function get_plugin($type = 'style', $name = NULL) {
$plugin->init($this->view, $this->display, $options);
}
else {
- $display_id = $this->is_defaulted($option_name) ? $this->display->id : 'default';
+ $display_id = $this->isDefaulted($option_name) ? $this->display->id : 'default';
$plugin->localization_keys = array($display_id, $type);
if (!isset($this->base_field)) {
@@ -846,9 +846,9 @@ function get_plugin($type = 'style', $name = NULL) {
/**
* Get the handler object for a single handler.
*/
- function &get_handler($type, $id) {
+ public function &getHandler($type, $id) {
if (!isset($this->handlers[$type])) {
- $this->get_handlers($type);
+ $this->getHandlers($type);
}
if (isset($this->handlers[$type][$id])) {
@@ -863,13 +863,13 @@ function &get_handler($type, $id) {
/**
* Get a full array of handlers for $type. This caches them.
*/
- function get_handlers($type) {
+ public function getHandlers($type) {
if (!isset($this->handlers[$type])) {
$this->handlers[$type] = array();
$types = View::viewsObjectTypes();
$plural = $types[$type]['plural'];
- foreach ($this->get_option($plural) as $id => $info) {
+ foreach ($this->getOption($plural) as $id => $info) {
// If this is during form submission and there are temporary options
// which can only appear if the view is in the edit cache, use those
// options instead. This is used for AJAX multi-step stuff.
@@ -885,7 +885,7 @@ function get_handlers($type) {
// handler that is in use. This piece of code checks that and,
// if necessary, sets the override handler.
$override = NULL;
- if ($this->use_group_by() && !empty($info['group_type'])) {
+ if ($this->useGroupBy() && !empty($info['group_type'])) {
if (empty($this->view->query)) {
$this->view->initQuery();
}
@@ -929,7 +929,7 @@ function get_handlers($type) {
* Return only an array of field labels from handler that return TRUE
* from use_string_group_by method.
*/
- function get_field_labels() {
+ public function getFieldLabels() {
// Use func_get_arg so the function signature isn't amended
// but we can still pass TRUE into the function to filter
// by groupable handlers.
@@ -937,7 +937,7 @@ function get_field_labels() {
$groupable_only = isset($args[0]) ? $args[0] : FALSE;
$options = array();
- foreach ($this->get_handlers('relationship') as $relationship => $handler) {
+ foreach ($this->getHandlers('relationship') as $relationship => $handler) {
if ($label = $handler->label()) {
$relationships[$relationship] = $label;
}
@@ -946,7 +946,7 @@ function get_field_labels() {
}
}
- foreach ($this->get_handlers('field') as $id => $handler) {
+ foreach ($this->getHandlers('field') as $id => $handler) {
if ($groupable_only && !$handler->use_string_group_by()) {
// Continue to next handler if it's not groupable.
continue;
@@ -968,9 +968,9 @@ function get_field_labels() {
* Intelligently set an option either from this display or from the
* default display, if directed to do so.
*/
- function set_option($option, $value) {
- if ($this->is_defaulted($option)) {
- return $this->default_display->set_option($option, $value);
+ public function setOption($option, $value) {
+ if ($this->isDefaulted($option)) {
+ return $this->default_display->setOption($option, $value);
}
// Set this in two places: On the handler where we'll notice it
@@ -983,16 +983,16 @@ function set_option($option, $value) {
/**
* Set an option and force it to be an override.
*/
- function override_option($option, $value) {
- $this->set_override($option, FALSE);
- $this->set_option($option, $value);
+ public function overrideOption($option, $value) {
+ $this->setOverride($option, FALSE);
+ $this->setOption($option, $value);
}
/**
* Because forms may be split up into sections, this provides
* an easy URL to exactly the right section. Don't override this.
*/
- function option_link($text, $section, $class = '', $title = '') {
+ public function optionLink($text, $section, $class = '', $title = '') {
views_add_js('ajax');
if (!empty($class)) {
$text = '<span>' . $text . '</span>';
@@ -1015,13 +1015,13 @@ function option_link($text, $section, $class = '', $title = '') {
* This function is similar to views_handler_field::get_render_tokens()
* but without fields tokens.
*/
- function get_arguments_tokens() {
+ public function getArgumentsTokens() {
$tokens = array();
if (!empty($this->view->build_info['substitutions'])) {
$tokens = $this->view->build_info['substitutions'];
}
$count = 0;
- foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
$token = '%' . ++$count;
if (!isset($tokens[$token])) {
$tokens[$token] = '';
@@ -1041,7 +1041,7 @@ function get_arguments_tokens() {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function optionsSummary(&$categories, &$options) {
$categories = array(
'title' => array(
'title' => t('Title'),
@@ -1095,7 +1095,7 @@ function options_summary(&$categories, &$options) {
);
}
- $display_comment = check_plain(drupal_substr($this->get_option('display_comment'), 0, 10));
+ $display_comment = check_plain(drupal_substr($this->getOption('display_comment'), 0, 10));
$options['display_comment'] = array(
'category' => 'other',
'title' => t('Comment'),
@@ -1103,7 +1103,7 @@ function options_summary(&$categories, &$options) {
'desc' => t('Comment or document this display.'),
);
- $title = strip_tags($this->get_option('title'));
+ $title = strip_tags($this->getOption('title'));
if (!$title) {
$title = t('None');
}
@@ -1116,8 +1116,8 @@ function options_summary(&$categories, &$options) {
);
$manager = new ViewsPluginManager('style');
- $style_plugin = $manager->getDefinition($this->get_option('style_plugin'));
- $style_plugin_instance = $this->get_plugin('style');
+ $style_plugin = $manager->getDefinition($this->getOption('style_plugin'));
+ $style_plugin_instance = $this->getPlugin('style');
$style_summary = empty($style_plugin['title']) ? t('Missing style plugin') : $style_plugin_instance->summary_title();
$style_title = empty($style_plugin['title']) ? t('Missing style plugin') : $style_plugin_instance->plugin_title();
@@ -1138,8 +1138,8 @@ function options_summary(&$categories, &$options) {
if ($style_plugin_instance->usesRowPlugin()) {
$manager = new ViewsPluginManager('row');
- $row_plugin = $manager->getDefinition($this->get_option('row_plugin'));
- $row_plugin_instance = $this->get_plugin('row');
+ $row_plugin = $manager->getDefinition($this->getOption('row_plugin'));
+ $row_plugin_instance = $this->getPlugin('row');
$row_summary = empty($row_plugin['title']) ? t('Missing style plugin') : $row_plugin_instance->summary_title();
$row_title = empty($row_plugin['title']) ? t('Missing style plugin') : $row_plugin_instance->plugin_title();
@@ -1159,7 +1159,7 @@ function options_summary(&$categories, &$options) {
$options['use_ajax'] = array(
'category' => 'other',
'title' => t('Use AJAX'),
- 'value' => $this->get_option('use_ajax') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('use_ajax') ? t('Yes') : t('No'),
'desc' => t('Change whether or not this display will use AJAX.'),
);
}
@@ -1167,7 +1167,7 @@ function options_summary(&$categories, &$options) {
$options['hide_attachment_summary'] = array(
'category' => 'other',
'title' => t('Hide attachments in summary'),
- 'value' => $this->get_option('hide_attachment_summary') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('hide_attachment_summary') ? t('Yes') : t('No'),
'desc' => t('Change whether or not to display attachments when displaying a contextual filter summary.'),
);
}
@@ -1175,12 +1175,12 @@ function options_summary(&$categories, &$options) {
$options['hide_admin_links'] = array(
'category' => 'other',
'title' => t('Hide contextual links'),
- 'value' => $this->get_option('hide_admin_links') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('hide_admin_links') ? t('Yes') : t('No'),
'desc' => t('Change whether or not to display contextual links for this view.'),
);
}
- $pager_plugin = $this->get_plugin('pager');
+ $pager_plugin = $this->getPlugin('pager');
if (!$pager_plugin) {
// default to the no pager plugin.
$pager_plugin = views_get_plugin('pager', 'none');
@@ -1209,7 +1209,7 @@ function options_summary(&$categories, &$options) {
$options['use_more'] = array(
'category' => 'pager',
'title' => t('More link'),
- 'value' => $this->get_option('use_more') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('use_more') ? t('Yes') : t('No'),
'desc' => t('Specify whether this display will provide a "more" link.'),
);
}
@@ -1219,7 +1219,7 @@ function options_summary(&$categories, &$options) {
$options['group_by'] = array(
'category' => 'other',
'title' => t('Use aggregation'),
- 'value' => $this->get_option('group_by') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('group_by') ? t('Yes') : t('No'),
'desc' => t('Allow grouping and aggregation (calculation) of fields.'),
);
}
@@ -1242,11 +1242,11 @@ function options_summary(&$categories, &$options) {
$options['field_langcode'] = array(
'category' => 'other',
'title' => t('Field Language'),
- 'value' => $languages[$this->get_option('field_langcode')],
+ 'value' => $languages[$this->getOption('field_langcode')],
'desc' => t('All fields which support translations will be displayed in the selected language.'),
);
- $access_plugin = $this->get_plugin('access');
+ $access_plugin = $this->getPlugin('access');
if (!$access_plugin) {
// default to the no access control plugin.
$access_plugin = views_get_plugin('access', 'none');
@@ -1266,7 +1266,7 @@ function options_summary(&$categories, &$options) {
$options['access']['links']['access_options'] = t('Change settings for this access type.');
}
- $cache_plugin = $this->get_plugin('cache');
+ $cache_plugin = $this->getPlugin('cache');
if (!$cache_plugin) {
// default to the no cache control plugin.
$cache_plugin = views_get_plugin('cache', 'none');
@@ -1290,10 +1290,10 @@ function options_summary(&$categories, &$options) {
$options['access']['links']['access_options'] = t('Change settings for this access type.');
}
- if ($this->uses_link_display()) {
- $display_id = $this->get_link_display();
+ if ($this->usesLinkDisplay()) {
+ $display_id = $this->getLinkDisplay();
$link_display = empty($this->view->display[$display_id]) ? t('None') : check_plain($this->view->display[$display_id]->display_title);
- $link_display = $this->get_option('link_display') == 'custom_url' ? t('Custom URL') : $link_display;
+ $link_display = $this->getOption('link_display') == 'custom_url' ? t('Custom URL') : $link_display;
$options['link_display'] = array(
'category' => 'other',
'title' => t('Link display'),
@@ -1302,16 +1302,16 @@ function options_summary(&$categories, &$options) {
);
}
- if ($this->uses_exposed_form_in_block()) {
+ if ($this->usesExposedFormInBlock()) {
$options['exposed_block'] = array(
'category' => 'exposed',
'title' => t('Exposed form in block'),
- 'value' => $this->get_option('exposed_block') ? t('Yes') : t('No'),
+ 'value' => $this->getOption('exposed_block') ? t('Yes') : t('No'),
'desc' => t('Allow the exposed form to appear in a block instead of the view.'),
);
}
- $exposed_form_plugin = $this->get_plugin('exposed_form');
+ $exposed_form_plugin = $this->getPlugin('exposed_form');
if (!$exposed_form_plugin) {
// default to the no cache control plugin.
$exposed_form_plugin = views_get_plugin('exposed_form', 'basic');
@@ -1331,7 +1331,7 @@ function options_summary(&$categories, &$options) {
$options['exposed_form']['links']['exposed_form_options'] = t('Exposed form settings for this exposed form style.');
}
- $css_class = check_plain(trim($this->get_option('css_class')));
+ $css_class = check_plain(trim($this->getOption('css_class')));
if (!$css_class) {
$css_class = t('None');
}
@@ -1351,7 +1351,7 @@ function options_summary(&$categories, &$options) {
);
foreach ($this->extender as $extender) {
- $extender->options_summary($categories, $options);
+ $extender->optionsSummary($categories, $options);
}
}
@@ -1360,7 +1360,7 @@ function options_summary(&$categories, &$options) {
*/
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- if ($this->defaultable_sections($form_state['section'])) {
+ if ($this->defaultableSections($form_state['section'])) {
views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
}
$form['#title'] = check_plain($this->display->display_title) . ': ';
@@ -1399,7 +1399,7 @@ function options_form(&$form, &$form_state) {
'#title' => t('Description'),
'#type' => 'textfield',
'#description' => t('This description will appear only in the administrative interface for the View.'),
- '#default_value' => $this->get_option('display_description'),
+ '#default_value' => $this->getOption('display_description'),
);
break;
case 'display_comment':
@@ -1407,7 +1407,7 @@ function options_form(&$form, &$form_state) {
$form['display_comment'] = array(
'#type' => 'textarea',
'#description' => t('This value will be seen and used only within the Views UI and can be used to document this display. You can use this to provide notes for other or future maintainers of your site about how or why this display is configured.'),
- '#default_value' => $this->get_option('display_comment'),
+ '#default_value' => $this->getOption('display_comment'),
);
break;
case 'title':
@@ -1415,7 +1415,7 @@ function options_form(&$form, &$form_state) {
$form['title'] = array(
'#type' => 'textfield',
'#description' => t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc.'),
- '#default_value' => $this->get_option('title'),
+ '#default_value' => $this->getOption('title'),
);
break;
case 'css_class':
@@ -1423,7 +1423,7 @@ function options_form(&$form, &$form_state) {
$form['css_class'] = array(
'#type' => 'textfield',
'#description' => t('The CSS class names will be added to the view. This enables you to use specific CSS code for each view. You may define multiples classes separated by spaces.'),
- '#default_value' => $this->get_option('css_class'),
+ '#default_value' => $this->getOption('css_class'),
);
break;
case 'use_ajax':
@@ -1434,7 +1434,7 @@ function options_form(&$form, &$form_state) {
$form['use_ajax'] = array(
'#type' => 'radios',
'#options' => array(1 => t('Yes'), 0 => t('No')),
- '#default_value' => $this->get_option('use_ajax') ? 1 : 0,
+ '#default_value' => $this->getOption('use_ajax') ? 1 : 0,
);
break;
case 'hide_attachment_summary':
@@ -1442,7 +1442,7 @@ function options_form(&$form, &$form_state) {
$form['hide_attachment_summary'] = array(
'#type' => 'radios',
'#options' => array(1 => t('Yes'), 0 => t('No')),
- '#default_value' => $this->get_option('hide_attachment_summary') ? 1 : 0,
+ '#default_value' => $this->getOption('hide_attachment_summary') ? 1 : 0,
);
break;
case 'hide_admin_links':
@@ -1450,7 +1450,7 @@ function options_form(&$form, &$form_state) {
$form['hide_admin_links'] = array(
'#type' => 'radios',
'#options' => array(1 => t('Yes'), 0 => t('No')),
- '#default_value' => $this->get_option('hide_admin_links') ? 1 : 0,
+ '#default_value' => $this->getOption('hide_admin_links') ? 1 : 0,
);
break;
case 'use_more':
@@ -1459,13 +1459,13 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Create more link'),
'#description' => t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' section under advanced. You can override the url at the link display setting."),
- '#default_value' => $this->get_option('use_more'),
+ '#default_value' => $this->getOption('use_more'),
);
$form['use_more_always'] = array(
'#type' => 'checkbox',
'#title' => t("Display 'more' link only if there is more content"),
'#description' => t("Leave this unchecked to display the 'more' link even if there are no more items to display."),
- '#default_value' => !$this->get_option('use_more_always'),
+ '#default_value' => !$this->getOption('use_more_always'),
'#states' => array(
'visible' => array(
':input[name="use_more"]' => array('checked' => TRUE),
@@ -1476,7 +1476,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'textfield',
'#title' => t('More link text'),
'#description' => t("The text to display for the more link."),
- '#default_value' => $this->get_option('use_more_text'),
+ '#default_value' => $this->getOption('useMoreText'),
'#states' => array(
'visible' => array(
':input[name="use_more"]' => array('checked' => TRUE),
@@ -1490,7 +1490,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkbox',
'#title' => t('Aggregate'),
'#description' => t('If enabled, some fields may become unavailable. All fields that are selected for grouping will be collapsed to one record per distinct value. Other fields which are selected for aggregation will have the function run on them. For example, you can group nodes on title and count the number of nids in order to get a list of duplicate titles.'),
- '#default_value' => $this->get_option('group_by'),
+ '#default_value' => $this->getOption('group_by'),
);
break;
case 'access':
@@ -1501,26 +1501,26 @@ function options_form(&$form, &$form_state) {
'#tree' => TRUE,
);
- $access = $this->get_option('access');
+ $access = $this->getOption('access');
$form['access']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('access', NULL, array($this->view->base_table)),
'#default_value' => $access['type'],
);
- $access_plugin = $this->get_plugin('access');
+ $access_plugin = $this->getPlugin('access');
if ($access_plugin->usesOptions()) {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
- '#markup' => t('You may also adjust the !settings for the currently selected access restriction.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected access restriction.', array('!settings' => $this->optionLink(t('settings'), 'access_options'))),
'#suffix' => '</div>',
);
}
break;
case 'access_options':
- $access = $this->get_option('access');
- $plugin = $this->get_plugin('access');
+ $access = $this->getOption('access');
+ $plugin = $this->getPlugin('access');
$form['#title'] .= t('Access options');
if ($plugin) {
$form['access_options'] = array(
@@ -1541,25 +1541,25 @@ function options_form(&$form, &$form_state) {
'#tree' => TRUE,
);
- $cache = $this->get_option('cache');
+ $cache = $this->getOption('cache');
$form['cache']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('cache', NULL, array($this->view->base_table)),
'#default_value' => $cache['type'],
);
- $cache_plugin = $this->get_plugin('cache');
+ $cache_plugin = $this->getPlugin('cache');
if ($cache_plugin->usesOptions()) {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
- '#markup' => t('You may also adjust the !settings for the currently selected cache mechanism.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected cache mechanism.', array('!settings' => $this->optionLink(t('settings'), 'cache_options'))),
);
}
break;
case 'cache_options':
- $cache = $this->get_option('cache');
- $plugin = $this->get_plugin('cache');
+ $cache = $this->getOption('cache');
+ $plugin = $this->getPlugin('cache');
$form['#title'] .= t('Caching options');
if ($plugin) {
$form['cache_options'] = array(
@@ -1573,7 +1573,7 @@ function options_form(&$form, &$form_state) {
}
break;
case 'query':
- $query_options = $this->get_option('query');
+ $query_options = $this->getOption('query');
$plugin_name = $query_options['type'];
$form['#title'] .= t('Query options');
@@ -1623,12 +1623,12 @@ function options_form(&$form, &$form_state) {
'#title' => t('Field Language'),
'#description' => t('All fields which support translations will be displayed in the selected language.'),
'#options' => $languages,
- '#default_value' => $this->get_option('field_langcode'),
+ '#default_value' => $this->getOption('field_langcode'),
);
$form['field_langcode_add_to_query'] = array(
'#type' => 'checkbox',
'#title' => t('When needed, add the field language condition to the query'),
- '#default_value' => $this->get_option('field_langcode_add_to_query'),
+ '#default_value' => $this->getOption('field_langcode_add_to_query'),
);
}
else {
@@ -1640,15 +1640,15 @@ function options_form(&$form, &$form_state) {
$form['#title'] .= t('How should this view be styled');
$form['style_plugin'] = array(
'#type' => 'radios',
- '#options' => views_fetch_plugin_names('style', $this->get_style_type(), array($this->view->base_table)),
- '#default_value' => $this->get_option('style_plugin'),
+ '#options' => views_fetch_plugin_names('style', $this->getStyleType(), array($this->view->base_table)),
+ '#default_value' => $this->getOption('style_plugin'),
'#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
);
- $style_plugin = $this->get_plugin('style');
+ $style_plugin = $this->getPlugin('style');
if ($style_plugin->usesOptions()) {
$form['markup'] = array(
- '#markup' => '<div class="form-item description">' . t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->option_link(t('settings'), 'style_options'))) . '</div>',
+ '#markup' => '<div class="form-item description">' . t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->optionLink(t('settings'), 'style_options'))) . '</div>',
);
}
@@ -1657,18 +1657,18 @@ function options_form(&$form, &$form_state) {
$form['#title'] .= t('Style options');
$style = TRUE;
$type = 'style_plugin';
- $name = $this->get_option('style_plugin');
+ $name = $this->getOption('style_plugin');
case 'row_options':
if (!isset($name)) {
- $name = $this->get_option('row_plugin');
+ $name = $this->getOption('row_plugin');
}
// if row, $style will be empty.
if (empty($style)) {
$form['#title'] .= t('Row style options');
$type = 'row_plugin';
}
- $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+ $plugin = $this->getPlugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$form[$form_state['section']] = array(
'#tree' => TRUE,
@@ -1680,14 +1680,14 @@ function options_form(&$form, &$form_state) {
$form['#title'] .= t('How should each row in this view be styled');
$form['row_plugin'] = array(
'#type' => 'radios',
- '#options' => views_fetch_plugin_names('row', $this->get_style_type(), array($this->view->base_table)),
- '#default_value' => $this->get_option('row_plugin'),
+ '#options' => views_fetch_plugin_names('row', $this->getStyleType(), array($this->view->base_table)),
+ '#default_value' => $this->getOption('row_plugin'),
);
- $row_plugin = $this->get_plugin('row');
+ $row_plugin = $this->getPlugin('row');
if ($row_plugin->usesOptions()) {
$form['markup'] = array(
- '#markup' => '<div class="form-item description">' . t('You may also adjust the !settings for the currently selected row style.', array('!settings' => $this->option_link(t('settings'), 'row_options'))) . '</div>',
+ '#markup' => '<div class="form-item description">' . t('You may also adjust the !settings for the currently selected row style.', array('!settings' => $this->optionLink(t('settings'), 'row_options'))) . '</div>',
);
}
@@ -1695,7 +1695,7 @@ function options_form(&$form, &$form_state) {
case 'link_display':
$form['#title'] .= t('Which display to use for path');
foreach ($this->view->display as $display_id => $display) {
- if ($display->handler->has_path()) {
+ if ($display->handler->hasPath()) {
$options[$display_id] = $display->display_title;
}
}
@@ -1705,13 +1705,13 @@ function options_form(&$form, &$form_state) {
'#type' => 'radios',
'#options' => $options,
'#description' => t("Which display to use to get this display's path for things like summary links, rss feed links, more links, etc."),
- '#default_value' => $this->get_option('link_display'),
+ '#default_value' => $this->getOption('link_display'),
);
}
$options = array();
$count = 0; // This lets us prepare the key as we want it printed.
- foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
$options[t('Arguments')]['%' . ++$count] = t('@argument title', array('@argument' => $handler->ui_name()));
$options[t('Arguments')]['!' . $count] = t('@argument input', array('@argument' => $handler->ui_name()));
}
@@ -1739,7 +1739,7 @@ function options_form(&$form, &$form_state) {
$form['link_url'] = array(
'#type' => 'textfield',
'#title' => t('Custom URL'),
- '#default_value' => $this->get_option('link_url'),
+ '#default_value' => $this->getOption('link_url'),
'#description' => t('A Drupal path or external URL the more link will point to. Note that this will override the link display setting above.') . $output,
'#states' => array(
'visible' => array(
@@ -1823,41 +1823,41 @@ function options_form(&$form, &$form_state) {
// not have themes. The 'feed' display, for example, completely
// delegates to the style.
if (!empty($this->definition['theme'])) {
- $funcs[] = $this->option_link(t('Display output'), 'analyze-theme-display') . ': ' . $this->format_themes($this->theme_functions());
+ $funcs[] = $this->optionLink(t('Display output'), 'analyze-theme-display') . ': ' . $this->formatThemes($this->theme_functions());
$themes = $this->additional_theme_functions();
if ($themes) {
foreach ($themes as $theme) {
- $funcs[] = $this->option_link(t('Alternative display output'), 'analyze-theme-display') . ': ' . $this->format_themes($theme);
+ $funcs[] = $this->optionLink(t('Alternative display output'), 'analyze-theme-display') . ': ' . $this->formatThemes($theme);
}
}
}
- $plugin = $this->get_plugin();
+ $plugin = $this->getPlugin();
if ($plugin) {
- $funcs[] = $this->option_link(t('Style output'), 'analyze-theme-style') . ': ' . $this->format_themes($plugin->theme_functions(), $plugin->additional_theme_functions());
+ $funcs[] = $this->optionLink(t('Style output'), 'analyze-theme-style') . ': ' . $this->formatThemes($plugin->theme_functions(), $plugin->additional_theme_functions());
$themes = $plugin->additional_theme_functions();
if ($themes) {
foreach ($themes as $theme) {
- $funcs[] = $this->option_link(t('Alternative style'), 'analyze-theme-style') . ': ' . $this->format_themes($theme);
+ $funcs[] = $this->optionLink(t('Alternative style'), 'analyze-theme-style') . ': ' . $this->formatThemes($theme);
}
}
if ($plugin->usesRowPlugin()) {
- $row_plugin = $this->get_plugin('row');
+ $row_plugin = $this->getPlugin('row');
if ($row_plugin) {
- $funcs[] = $this->option_link(t('Row style output'), 'analyze-theme-row') . ': ' . $this->format_themes($row_plugin->theme_functions());
+ $funcs[] = $this->optionLink(t('Row style output'), 'analyze-theme-row') . ': ' . $this->formatThemes($row_plugin->theme_functions());
$themes = $row_plugin->additional_theme_functions();
if ($themes) {
foreach ($themes as $theme) {
- $funcs[] = $this->option_link(t('Alternative row style'), 'analyze-theme-row') . ': ' . $this->format_themes($theme);
+ $funcs[] = $this->optionLink(t('Alternative row style'), 'analyze-theme-row') . ': ' . $this->formatThemes($theme);
}
}
}
}
if ($plugin->usesFields()) {
- foreach ($this->get_handlers('field') as $id => $handler) {
- $funcs[] = $this->option_link(t('Field @field (ID: @id)', array('@field' => $handler->ui_name(), '@id' => $id)), 'analyze-theme-field') . ': ' . $this->format_themes($handler->theme_functions());
+ foreach ($this->getHandlers('field') as $id => $handler) {
+ $funcs[] = $this->optionLink(t('Field @field (ID: @id)', array('@field' => $handler->ui_name(), '@id' => $id)), 'analyze-theme-field') . ': ' . $this->formatThemes($handler->theme_functions());
}
}
}
@@ -1918,7 +1918,7 @@ function options_form(&$form, &$form_state) {
break;
case 'analyze-theme-display':
$form['#title'] .= t('Theming information (display)');
- $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+ $output = '<p>' . t('Back to !info.', array('!info' => $this->optionLink(t('theming information'), 'analyze-theme'))) . '</p>';
if (empty($this->definition['theme'])) {
$output .= t('This display has no theming information');
@@ -1943,9 +1943,9 @@ function options_form(&$form, &$form_state) {
break;
case 'analyze-theme-style':
$form['#title'] .= t('Theming information (style)');
- $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+ $output = '<p>' . t('Back to !info.', array('!info' => $this->optionLink(t('theming information'), 'analyze-theme'))) . '</p>';
- $plugin = $this->get_plugin();
+ $plugin = $this->getPlugin();
if (empty($plugin->definition['theme'])) {
$output .= t('This display has no style theming information');
@@ -1970,9 +1970,9 @@ function options_form(&$form, &$form_state) {
break;
case 'analyze-theme-row':
$form['#title'] .= t('Theming information (row style)');
- $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+ $output = '<p>' . t('Back to !info.', array('!info' => $this->optionLink(t('theming information'), 'analyze-theme'))) . '</p>';
- $plugin = $this->get_plugin('row');
+ $plugin = $this->getPlugin('row');
if (empty($plugin->definition['theme'])) {
$output .= t('This display has no row style theming information');
@@ -1997,7 +1997,7 @@ function options_form(&$form, &$form_state) {
break;
case 'analyze-theme-field':
$form['#title'] .= t('Theming information (row style)');
- $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+ $output = '<p>' . t('Back to !info.', array('!info' => $this->optionLink(t('theming information'), 'analyze-theme'))) . '</p>';
$output .= '<p>' . t('This is the default theme template used for this row style.') . '</p>';
@@ -2019,7 +2019,7 @@ function options_form(&$form, &$form_state) {
$form['exposed_block'] = array(
'#type' => 'radios',
'#options' => array(1 => t('Yes'), 0 => t('No')),
- '#default_value' => $this->get_option('exposed_block') ? 1 : 0,
+ '#default_value' => $this->getOption('exposed_block') ? 1 : 0,
);
break;
case 'exposed_form':
@@ -2030,24 +2030,24 @@ function options_form(&$form, &$form_state) {
'#tree' => TRUE,
);
- $exposed_form = $this->get_option('exposed_form');
+ $exposed_form = $this->getOption('exposed_form');
$form['exposed_form']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('exposed_form', NULL, array($this->view->base_table)),
'#default_value' => $exposed_form['type'],
);
- $exposed_form_plugin = $this->get_plugin('exposed_form');
+ $exposed_form_plugin = $this->getPlugin('exposed_form');
if ($exposed_form_plugin->usesOptions()) {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
- '#markup' => t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->option_link(t('settings'), 'exposed_form_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected style.', array('!settings' => $this->optionLink(t('settings'), 'exposed_form_options'))),
);
}
break;
case 'exposed_form_options':
- $plugin = $this->get_plugin('exposed_form');
+ $plugin = $this->getPlugin('exposed_form');
$form['#title'] .= t('Exposed form options');
if ($plugin) {
$form['exposed_form_options'] = array(
@@ -2064,25 +2064,25 @@ function options_form(&$form, &$form_state) {
'#tree' => TRUE,
);
- $pager = $this->get_option('pager');
+ $pager = $this->getOption('pager');
$form['pager']['type'] = array(
'#type' => 'radios',
'#options' => views_fetch_plugin_names('pager', !$this->usesPager() ? 'basic' : NULL, array($this->view->base_table)),
'#default_value' => $pager['type'],
);
- $pager_plugin = $this->get_plugin('pager');
+ $pager_plugin = $this->getPlugin('pager');
if ($pager_plugin->usesOptions()) {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
- '#markup' => t('You may also adjust the !settings for the currently selected pager.', array('!settings' => $this->option_link(t('settings'), 'pager_options'))),
+ '#markup' => t('You may also adjust the !settings for the currently selected pager.', array('!settings' => $this->optionLink(t('settings'), 'pager_options'))),
);
}
break;
case 'pager_options':
- $plugin = $this->get_plugin('pager');
+ $plugin = $this->getPlugin('pager');
$form['#title'] .= t('Pager options');
if ($plugin) {
$form['pager_options'] = array(
@@ -2101,7 +2101,7 @@ function options_form(&$form, &$form_state) {
/**
* Format a list of theme templates for output by the theme info helper.
*/
- function format_themes($themes) {
+ protected function formatThemes($themes) {
$registry = $this->theme_registry;
$extension = $this->theme_extension;
@@ -2159,13 +2159,13 @@ function options_validate(&$form, &$form_state) {
$style = TRUE;
case 'row_options':
// if row, $style will be empty.
- $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+ $plugin = $this->getPlugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$plugin->options_validate($form[$form_state['section']], $form_state);
}
break;
case 'access_options':
- $plugin = $this->get_plugin('access');
+ $plugin = $this->getPlugin('access');
if ($plugin) {
$plugin->options_validate($form['access_options'], $form_state);
}
@@ -2176,19 +2176,19 @@ function options_validate(&$form, &$form_state) {
}
break;
case 'cache_options':
- $plugin = $this->get_plugin('cache');
+ $plugin = $this->getPlugin('cache');
if ($plugin) {
$plugin->options_validate($form['cache_options'], $form_state);
}
break;
case 'exposed_form_options':
- $plugin = $this->get_plugin('exposed_form');
+ $plugin = $this->getPlugin('exposed_form');
if ($plugin) {
$plugin->options_validate($form['exposed_form_options'], $form_state);
}
break;
case 'pager_options':
- $plugin = $this->get_plugin('pager');
+ $plugin = $this->getPlugin('pager');
if ($plugin) {
$plugin->options_validate($form['pager_options'], $form_state);
}
@@ -2206,7 +2206,7 @@ function options_validate(&$form, &$form_state) {
*/
function options_submit(&$form, &$form_state) {
// Not sure I like this being here, but it seems (?) like a logical place.
- $cache_plugin = $this->get_plugin('cache');
+ $cache_plugin = $this->getPlugin('cache');
if ($cache_plugin) {
$cache_plugin->cache_flush();
}
@@ -2220,15 +2220,15 @@ function options_submit(&$form, &$form_state) {
break;
case 'display_title':
$this->display->display_title = $form_state['values']['display_title'];
- $this->set_option('display_description', $form_state['values']['display_description']);
+ $this->setOption('display_description', $form_state['values']['display_description']);
break;
case 'access':
- $access = $this->get_option('access');
+ $access = $this->getOption('access');
if ($access['type'] != $form_state['values']['access']['type']) {
$plugin = views_get_plugin('access', $form_state['values']['access']['type']);
if ($plugin) {
$access = array('type' => $form_state['values']['access']['type']);
- $this->set_option('access', $access);
+ $this->setOption('access', $access);
if ($plugin->usesOptions()) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('access_options'));
}
@@ -2240,16 +2240,16 @@ function options_submit(&$form, &$form_state) {
$plugin = views_get_plugin('access', $form_state['values'][$section]['type']);
if ($plugin) {
$plugin->options_submit($form['access_options'], $form_state);
- $this->set_option('access', $form_state['values'][$section]);
+ $this->setOption('access', $form_state['values'][$section]);
}
break;
case 'cache':
- $cache = $this->get_option('cache');
+ $cache = $this->getOption('cache');
if ($cache['type'] != $form_state['values']['cache']['type']) {
$plugin = views_get_plugin('cache', $form_state['values']['cache']['type']);
if ($plugin) {
$cache = array('type' => $form_state['values']['cache']['type']);
- $this->set_option('cache', $cache);
+ $this->setOption('cache', $cache);
if ($plugin->usesOptions()) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('cache_options'));
}
@@ -2261,51 +2261,51 @@ function options_submit(&$form, &$form_state) {
$plugin = views_get_plugin('cache', $form_state['values'][$section]['type']);
if ($plugin) {
$plugin->options_submit($form['cache_options'], $form_state);
- $this->set_option('cache', $form_state['values'][$section]);
+ $this->setOption('cache', $form_state['values'][$section]);
}
break;
case 'query':
$plugin = $this->get_plugin('query');
if ($plugin) {
$plugin->options_submit($form['query']['options'], $form_state);
- $this->set_option('query', $form_state['values'][$section]);
+ $this->setOption('query', $form_state['values'][$section]);
}
break;
case 'link_display':
- $this->set_option('link_url', $form_state['values']['link_url']);
+ $this->setOption('link_url', $form_state['values']['link_url']);
case 'title':
case 'css_class':
case 'display_comment':
- $this->set_option($section, $form_state['values'][$section]);
+ $this->setOption($section, $form_state['values'][$section]);
break;
case 'field_language':
- $this->set_option('field_langcode', $form_state['values']['field_langcode']);
- $this->set_option('field_langcode_add_to_query', $form_state['values']['field_langcode_add_to_query']);
+ $this->setOption('field_langcode', $form_state['values']['field_langcode']);
+ $this->setOption('field_langcode_add_to_query', $form_state['values']['field_langcode_add_to_query']);
break;
case 'use_ajax':
case 'hide_attachment_summary':
case 'hide_admin_links':
- $this->set_option($section, (bool)$form_state['values'][$section]);
+ $this->setOption($section, (bool)$form_state['values'][$section]);
break;
case 'use_more':
- $this->set_option($section, intval($form_state['values'][$section]));
- $this->set_option('use_more_always', !intval($form_state['values']['use_more_always']));
- $this->set_option('use_more_text', $form_state['values']['use_more_text']);
+ $this->setOption($section, intval($form_state['values'][$section]));
+ $this->setOption('use_more_always', !intval($form_state['values']['use_more_always']));
+ $this->setOption('use_more_text', $form_state['values']['use_more_text']);
case 'distinct':
- $this->set_option($section, $form_state['values'][$section]);
+ $this->setOption($section, $form_state['values'][$section]);
break;
case 'group_by':
- $this->set_option($section, $form_state['values'][$section]);
+ $this->setOption($section, $form_state['values'][$section]);
break;
case 'row_plugin':
// This if prevents resetting options to default if they don't change
// the plugin.
- if ($this->get_option($section) != $form_state['values'][$section]) {
+ if ($this->getOption($section) != $form_state['values'][$section]) {
$plugin = views_get_plugin('row', $form_state['values'][$section]);
if ($plugin) {
- $this->set_option($section, $form_state['values'][$section]);
- $this->set_option('row_options', array());
+ $this->setOption($section, $form_state['values'][$section]);
+ $this->setOption('row_options', array());
// send ajax form to options page if we use it.
if ($plugin->usesOptions()) {
@@ -2317,11 +2317,11 @@ function options_submit(&$form, &$form_state) {
case 'style_plugin':
// This if prevents resetting options to default if they don't change
// the plugin.
- if ($this->get_option($section) != $form_state['values'][$section]) {
+ if ($this->getOption($section) != $form_state['values'][$section]) {
$plugin = views_get_plugin('style', $form_state['values'][$section]);
if ($plugin) {
- $this->set_option($section, $form_state['values'][$section]);
- $this->set_option('style_options', array());
+ $this->setOption($section, $form_state['values'][$section]);
+ $this->setOption('style_options', array());
// send ajax form to options page if we use it.
if ($plugin->usesOptions()) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('style_options'));
@@ -2333,22 +2333,22 @@ function options_submit(&$form, &$form_state) {
$style = TRUE;
case 'row_options':
// if row, $style will be empty.
- $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+ $plugin = $this->getPlugin(empty($style) ? 'row' : 'style');
if ($plugin) {
$plugin->options_submit($form['options'][$section], $form_state);
}
- $this->set_option($section, $form_state['values'][$section]);
+ $this->setOption($section, $form_state['values'][$section]);
break;
case 'exposed_block':
- $this->set_option($section, (bool) $form_state['values'][$section]);
+ $this->setOption($section, (bool) $form_state['values'][$section]);
break;
case 'exposed_form':
- $exposed_form = $this->get_option('exposed_form');
+ $exposed_form = $this->getOption('exposed_form');
if ($exposed_form['type'] != $form_state['values']['exposed_form']['type']) {
$plugin = views_get_plugin('exposed_form', $form_state['values']['exposed_form']['type']);
if ($plugin) {
$exposed_form = array('type' => $form_state['values']['exposed_form']['type'], 'options' => array());
- $this->set_option('exposed_form', $exposed_form);
+ $this->setOption('exposed_form', $exposed_form);
if ($plugin->usesOptions()) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('exposed_form_options'));
}
@@ -2357,16 +2357,16 @@ function options_submit(&$form, &$form_state) {
break;
case 'exposed_form_options':
- $plugin = $this->get_plugin('exposed_form');
+ $plugin = $this->getPlugin('exposed_form');
if ($plugin) {
- $exposed_form = $this->get_option('exposed_form');
+ $exposed_form = $this->getOption('exposed_form');
$plugin->options_submit($form['exposed_form_options'], $form_state);
$exposed_form['options'] = $form_state['values'][$section];
- $this->set_option('exposed_form', $exposed_form);
+ $this->setOption('exposed_form', $exposed_form);
}
break;
case 'pager':
- $pager = $this->get_option('pager');
+ $pager = $this->getOption('pager');
if ($pager['type'] != $form_state['values']['pager']['type']) {
$plugin = views_get_plugin('pager', $form_state['values']['pager']['type']);
if ($plugin) {
@@ -2375,7 +2375,7 @@ function options_submit(&$form, &$form_state) {
$plugin->init($this->view, $this->display, $pager['options']);
$pager = array('type' => $form_state['values']['pager']['type'], 'options' => $plugin->options);
- $this->set_option('pager', $pager);
+ $this->setOption('pager', $pager);
if ($plugin->usesOptions()) {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('pager_options'));
}
@@ -2384,12 +2384,12 @@ function options_submit(&$form, &$form_state) {
break;
case 'pager_options':
- $plugin = $this->get_plugin('pager');
+ $plugin = $this->getPlugin('pager');
if ($plugin) {
- $pager = $this->get_option('pager');
+ $pager = $this->getOption('pager');
$plugin->options_submit($form['pager_options'], $form_state);
$pager['options'] = $form_state['values'][$section];
- $this->set_option('pager', $pager);
+ $this->setOption('pager', $pager);
}
break;
}
@@ -2402,8 +2402,8 @@ function options_submit(&$form, &$form_state) {
/**
* If override/revert was clicked, perform the proper toggle.
*/
- function options_override($form, &$form_state) {
- $this->set_override($form_state['section']);
+ public function optionsOverride($form, &$form_state) {
+ $this->setOverride($form_state['section']);
}
/**
@@ -2416,8 +2416,8 @@ function options_override($form, &$form_state) {
* - TRUE: Revert to default.
* - FALSE: Mark it as overridden.
*/
- function set_override($section, $new_state = NULL) {
- $options = $this->defaultable_sections($section);
+ public function setOverride($section, $new_state = NULL) {
+ $options = $this->defaultableSections($section);
if (!$options) {
return;
}
@@ -2435,7 +2435,7 @@ function set_override($section, $new_state = NULL) {
}
else {
// copy existing values into our display.
- $this->options[$option] = $this->get_option($option);
+ $this->options[$option] = $this->getOption($option);
$this->display->display_options[$option] = $this->options[$option];
}
$this->options['defaults'][$option] = $new_state;
@@ -2446,7 +2446,7 @@ function set_override($section, $new_state = NULL) {
/**
* Inject anything into the query that the display handler needs.
*/
- function query() {
+ public function query() {
foreach ($this->extender as $extender) {
$extender->query();
}
@@ -2454,25 +2454,27 @@ function query() {
/**
* Not all display plugins will support filtering
+ *
+ * @todo this doesn't seems to be used
*/
- function render_filters() { }
+ public function renderFilters() { }
/**
* Not all display plugins will suppert pager rendering.
*/
- function render_pager() {
+ public function renderPager() {
return TRUE;
}
/**
* Render the 'more' link
*/
- function render_more_link() {
- if ($this->usesMore() && ($this->use_more_always() || (!empty($this->view->pager) && $this->view->pager->has_more_records()))) {
- $path = $this->get_path();
+ public function renderMoreLink() {
+ if ($this->usesMore() && ($this->useMoreAlways() || (!empty($this->view->pager) && $this->view->pager->has_more_records()))) {
+ $path = $this->getPath();
- if ($this->get_option('link_display') == 'custom_url' && $override_path = $this->get_option('link_url')) {
- $tokens = $this->get_arguments_tokens();
+ if ($this->getOption('link_display') == 'custom_url' && $override_path = $this->getOption('link_url')) {
+ $tokens = $this->getArgumentsTokens();
$path = strtr($override_path, $tokens);
}
@@ -2487,7 +2489,7 @@ function render_more_link() {
$theme = views_theme_functions('views_more', $this->view, $this->display);
$path = check_url(url($path, $url_options));
- return theme($theme, array('more_url' => $path, 'link_text' => check_plain($this->use_more_text()), 'view' => $this->view));
+ return theme($theme, array('more_url' => $path, 'link_text' => check_plain($this->useMoreText()), 'view' => $this->view));
}
}
}
@@ -2500,43 +2502,43 @@ function render_more_link() {
/**
* Render the header of the view.
*/
- function render_header() {
+ public function renderHeader() {
$empty = !empty($this->view->result);
- return $this->render_area('header', $empty);
+ return $this->renderArea('header', $empty);
}
/**
* Render the footer of the view.
*/
- function render_footer() {
+ public function renderFooter() {
$empty = !empty($this->view->result);
- return $this->render_area('footer', $empty);
+ return $this->renderArea('footer', $empty);
}
- function render_empty() {
- return $this->render_area('empty');
+ public function renderEmpty() {
+ return $this->renderArea('empty');
}
/**
* If this display creates a block, implement one of these.
*/
- function hook_block_list($delta = 0, $edit = array()) { return array(); }
+ public function hookBlockList($delta = 0, $edit = array()) { return array(); }
/**
* If this display creates a page with a menu item, implement it here.
*/
- function hook_menu() { return array(); }
+ public function hookMenu() { return array(); }
/**
* Render this display.
*/
- function render() {
+ public function render() {
return theme($this->theme_functions(), array('view' => $this->view));
}
- function render_area($area, $empty = FALSE) {
+ public function renderArea($area, $empty = FALSE) {
$return = '';
- foreach ($this->get_handlers($area) as $area) {
+ foreach ($this->getHandlers($area) as $area) {
$return .= $area->render($empty);
}
return $return;
@@ -2546,7 +2548,7 @@ function render_area($area, $empty = FALSE) {
/**
* Determine if the user has access to this display of the view.
*/
- function access($account = NULL) {
+ public function access($account = NULL) {
if (!isset($account)) {
global $user;
$account = $user;
@@ -2557,7 +2559,7 @@ function access($account = NULL) {
return TRUE;
}
- $plugin = $this->get_plugin('access');
+ $plugin = $this->getPlugin('access');
if ($plugin) {
return $plugin->access($account);
}
@@ -2571,14 +2573,14 @@ function access($account = NULL) {
* from execute because they are extremely common and unlikely to be
* overridden on an individual display.
*/
- function pre_execute() {
+ public function preExecute() {
$this->view->setUseAJAX($this->isAJAXEnabled());
- if ($this->usesMore() && !$this->use_more_always()) {
+ if ($this->usesMore() && !$this->useMoreAlways()) {
$this->view->get_total_rows = TRUE;
}
$this->view->initHandlers();
- if ($this->uses_exposed()) {
- $exposed_form = $this->get_plugin('exposed_form');
+ if ($this->usesExposed()) {
+ $exposed_form = $this->getPlugin('exposed_form');
$exposed_form->pre_execute();
}
@@ -2586,7 +2588,7 @@ function pre_execute() {
$extender->pre_execute();
}
- if ($this->get_option('hide_admin_links')) {
+ if ($this->getOption('hide_admin_links')) {
$this->view->hide_admin_links = TRUE;
}
}
@@ -2597,7 +2599,7 @@ function pre_execute() {
*
* The base class cannot be executed.
*/
- function execute() { }
+ public function execute() { }
/**
* Fully render the display for the purposes of a live preview or
@@ -2609,7 +2611,7 @@ function preview() { return $this->view->render(); }
* Displays can require a certain type of style plugin. By default, they will
* be 'normal'.
*/
- function get_style_type() { return 'normal'; }
+ protected function getStyleType() { return 'normal'; }
/**
* Make sure the display and all associated handlers are valid.
@@ -2617,12 +2619,12 @@ function get_style_type() { return 'normal'; }
* @return
* Empty array if the display is valid; an array of error strings if it is not.
*/
- function validate() {
+ public function validate() {
$errors = array();
// Make sure displays that use fields HAVE fields.
if ($this->usesFields()) {
$fields = FALSE;
- foreach ($this->get_handlers('field') as $field) {
+ foreach ($this->getHandlers('field') as $field) {
if (empty($field->options['exclude'])) {
$fields = TRUE;
}
@@ -2633,12 +2635,12 @@ function validate() {
}
}
- if ($this->has_path() && !$this->get_option('path')) {
+ if ($this->hasPath() && !$this->getOption('path')) {
$errors[] = t('Display "@display" uses a path but the path is undefined.', array('@display' => $this->display->display_title));
}
// Validate style plugin
- $style = $this->get_plugin();
+ $style = $this->getPlugin();
if (empty($style)) {
$errors[] = t('Display "@display" has an invalid style plugin.', array('@display' => $this->display->display_title));
}
@@ -2650,7 +2652,7 @@ function validate() {
}
// Validate query plugin.
- $query = $this->get_plugin('query');
+ $query = $this->getPlugin('query');
$result = $query->validate();
if (!empty($result) && is_array($result)) {
$errors = array_merge($errors, $result);
@@ -2658,7 +2660,7 @@ function validate() {
// Validate handlers
foreach (View::viewsObjectTypes() as $type => $info) {
- foreach ($this->get_handlers($type) as $handler) {
+ foreach ($this->getHandlers($type) as $handler) {
$result = $handler->validate();
if (!empty($result) && is_array($result)) {
$errors = array_merge($errors, $result);
@@ -2681,9 +2683,9 @@ function validate() {
* Returns whether the identifier is unique on all handlers.
*
*/
- function is_identifier_unique($id, $identifier) {
+ public function isIdentifierUnique($id, $identifier) {
foreach (View::viewsObjectTypes() as $type => $info) {
- foreach ($this->get_handlers($type) as $key => $handler) {
+ foreach ($this->getHandlers($type) as $key => $handler) {
if ($handler->can_expose() && $handler->is_exposed()) {
if ($handler->is_a_group()) {
if ($id != $key && $identifier == $handler->options['group_info']['identifier']) {
@@ -2704,10 +2706,10 @@ function is_identifier_unique($id, $identifier) {
/**
* Provide the block system with any exposed widget blocks for this display.
*/
- function get_special_blocks() {
+ public function getSpecialBlocks() {
$blocks = array();
- if ($this->uses_exposed_form_in_block()) {
+ if ($this->usesExposedFormInBlock()) {
$delta = '-exp-' . $this->view->name . '-' . $this->display->id;
$desc = t('Exposed form: @view-@display_id', array('@view' => $this->view->name, '@display_id' => $this->display->id));
@@ -2723,7 +2725,7 @@ function get_special_blocks() {
/**
* Render any special blocks provided for this display.
*/
- function view_special_blocks($type) {
+ public function viewSpecialBlocks($type) {
if ($type == '-exp') {
// avoid interfering with the admin forms.
if (arg(0) == 'admin' && arg(1) == 'structure' && arg(2) == 'views') {
@@ -2731,8 +2733,8 @@ function view_special_blocks($type) {
}
$this->view->initHandlers();
- if ($this->uses_exposed() && $this->get_option('exposed_block')) {
- $exposed_form = $this->get_plugin('exposed_form');
+ if ($this->usesExposed() && $this->getOption('exposed_block')) {
+ $exposed_form = $this->getPlugin('exposed_form');
return array(
'content' => $exposed_form->render_exposed_form(TRUE),
);
@@ -2750,15 +2752,15 @@ function export_option($indent, $prefix, $storage, $option, $definition, $parent
// The $prefix is wrong because we store our actual options a little differently:
$prefix = '$handler->display->display_options';
$output = '';
- if (!$parents && !$this->is_default_display()) {
+ if (!$parents && !$this->isDefaultDisplay()) {
// Do not export items that are not overridden.
- if ($this->is_defaulted($option)) {
+ if ($this->isDefaulted($option)) {
return;
}
// If this is not defaulted and is overrideable, flip the switch to say this
// is overridden.
- if ($this->defaultable_sections($option)) {
+ if ($this->defaultableSections($option)) {
$output .= $indent . $prefix . "['defaults']['$option'] = FALSE;\n";
}
}
@@ -2775,7 +2777,7 @@ function export_option($indent, $prefix, $storage, $option, $definition, $parent
* the export off to the individual handlers so that they can export themselves
* properly.
*/
- function export_handler($indent, $prefix, $storage, $option, $definition, $parents) {
+ public function exportHandler($indent, $prefix, $storage, $option, $definition, $parents) {
$output = '';
// cut the 's' off because the data is stored as the plural form but we need
@@ -2798,7 +2800,7 @@ function export_handler($indent, $prefix, $storage, $option, $definition, $paren
// handler that is in use. This piece of code checks that and,
// if necessary, sets the override handler.
$override = NULL;
- if ($this->use_group_by() && !empty($info['group_type'])) {
+ if ($this->useGroupBy() && !empty($info['group_type'])) {
if (empty($this->view->query)) {
$this->view->initQuery();
}
@@ -2828,9 +2830,9 @@ function export_handler($indent, $prefix, $storage, $option, $definition, $paren
* row_options accordingly. The options are told not to export, and the
* export for the plugin should export both.
*/
- function export_style($indent, $prefix, $storage, $option, $definition, $parents) {
+ public function exportStyle($indent, $prefix, $storage, $option, $definition, $parents) {
$output = '';
- $style_plugin = $this->get_plugin();
+ $style_plugin = $this->getPlugin();
if ($option == 'style_plugin') {
$type = 'style';
$options_field = 'style_options';
@@ -2843,13 +2845,13 @@ function export_style($indent, $prefix, $storage, $option, $definition, $parents
$type = 'row';
$options_field = 'row_options';
- $plugin = $this->get_plugin('row');
+ $plugin = $this->getPlugin('row');
// If the style plugin doesn't use row plugins, don't even bother.
}
if ($plugin) {
// Write which plugin to use.
- $value = $this->get_option($option);
+ $value = $this->getOption($option);
$output .= $indent . $prefix . "['$option'] = '$value';\n";
// Pass off to the plugin to export itself.
@@ -2867,10 +2869,10 @@ function export_style($indent, $prefix, $storage, $option, $definition, $parents
* array, but for legacy plugins (access and cache) options are stored as
* siblings to the type.
*/
- function export_plugin($indent, $prefix, $storage, $option, $definition, $parents) {
+ public function exportPlugin($indent, $prefix, $storage, $option, $definition, $parents) {
$output = '';
$plugin_type = end($parents);
- $plugin = $this->get_plugin($plugin_type);
+ $plugin = $this->getPlugin($plugin_type);
if ($plugin) {
// Write which plugin to use.
$value = $storage[$option];
@@ -2889,9 +2891,9 @@ function export_plugin($indent, $prefix, $storage, $option, $definition, $parent
return $output;
}
- function unpack_style($indent, $prefix, $storage, $option, $definition, $parents) {
+ public function unpackStyle($indent, $prefix, $storage, $option, $definition, $parents) {
$output = '';
- $style_plugin = $this->get_plugin();
+ $style_plugin = $this->getPlugin();
if ($option == 'style_plugin') {
$type = 'style';
$options_field = 'style_options';
@@ -2904,7 +2906,7 @@ function unpack_style($indent, $prefix, $storage, $option, $definition, $parents
$type = 'row';
$options_field = 'row_options';
- $plugin = $this->get_plugin('row');
+ $plugin = $this->getPlugin('row');
// If the style plugin doesn't use row plugins, don't even bother.
}
@@ -2916,9 +2918,9 @@ function unpack_style($indent, $prefix, $storage, $option, $definition, $parents
/**
* Special handling for plugin unpacking.
*/
- function unpack_plugin(&$translatable, $storage, $option, $definition, $parents) {
+ public function unpackPlugin(&$translatable, $storage, $option, $definition, $parents) {
$plugin_type = end($parents);
- $plugin = $this->get_plugin($plugin_type);
+ $plugin = $this->getPlugin($plugin_type);
if ($plugin) {
// Write which plugin to use.
return $plugin->unpack_translatables($translatable, $parents);
@@ -2933,7 +2935,7 @@ function unpack_plugin(&$translatable, $storage, $option, $definition, $parents)
* the export off to the individual handlers so that they can export themselves
* properly.
*/
- function unpack_handler(&$translatable, $storage, $option, $definition, $parents) {
+ public function unpackHandler(&$translatable, $storage, $option, $definition, $parents) {
$output = '';
// cut the 's' off because the data is stored as the plural form but we need
@@ -2976,7 +2978,7 @@ function unpack_handler(&$translatable, $storage, $option, $definition, $parents
* - description: A description about how arguments comes to the display.
* For example blocks don't get it from url.
*/
- function get_argument_text() {
+ public function getArgumentText() {
return array(
'filter value not present' => t('When the filter value is <em>NOT</em> available'),
'filter value present' => t('When the filter value <em>IS</em> available or a default is provided'),
@@ -2990,7 +2992,7 @@ function get_argument_text() {
* The result should contain of an array within
* - items per page title
*/
- function get_pager_text() {
+ public function getPagerText() {
return array(
'items per page title' => t('Items to display'),
'items per page description' => t('The number of items to display. Enter 0 for no limit.')
diff --git a/lib/Drupal/views/Plugin/views/display/Feed.php b/lib/Drupal/views/Plugin/views/display/Feed.php
index 951bf84b2957..93ee122f0712 100644
--- a/lib/Drupal/views/Plugin/views/display/Feed.php
+++ b/lib/Drupal/views/Plugin/views/display/Feed.php
@@ -43,28 +43,28 @@ class Feed extends Page {
*/
protected $usesPager = FALSE;
- function init(&$view, &$display, $options = NULL) {
+ public function init(&$view, &$display, $options = NULL) {
parent::init($view, $display, $options);
// Set the default row style. Ideally this would be part of the option
// definition, but in this case it's dependent on the view's base table,
// which we don't know until init().
- $row_plugins = views_fetch_plugin_names('row', $this->get_style_type(), array($view->base_table));
+ $row_plugins = views_fetch_plugin_names('row', $this->getStyleType(), array($view->base_table));
$default_row_plugin = key($row_plugins);
if ($this->options['row_plugin'] == '') {
$this->options['row_plugin'] = $default_row_plugin;
}
}
- function uses_breadcrumb() { return FALSE; }
- function get_style_type() { return 'feed'; }
+ public function usesBreadcrumb() { return FALSE; }
+ protected function getStyleType() { return 'feed'; }
/**
* Feeds do not go through the normal page theming mechanism. Instead, they
* go through their own little theme function and then return NULL so that
* Drupal believes that the page has already rendered itself...which it has.
*/
- function execute() {
+ public function execute() {
$output = $this->view->render();
if (empty($output)) {
throw new NotFoundHttpException();
@@ -75,7 +75,7 @@ function execute() {
return $response;
}
- function preview() {
+ public function preview() {
if (!empty($this->view->live_preview)) {
return '<pre>' . check_plain($this->view->render()) . '</pre>';
}
@@ -86,16 +86,16 @@ function preview() {
* Instead of going through the standard views_view.tpl.php, delegate this
* to the style handler.
*/
- function render() {
+ public function render() {
return $this->view->style_plugin->render($this->view->result);
}
- function defaultable_sections($section = NULL) {
+ public function defaultableSections($section = NULL) {
if (in_array($section, array('style_options', 'style_plugin', 'row_options', 'row_plugin'))) {
return FALSE;
}
- $sections = parent::defaultable_sections($section);
+ $sections = parent::defaultableSections($section);
// Tell views our sitename_title option belongs in the title section.
if ($section == 'title') {
@@ -107,7 +107,7 @@ function defaultable_sections($section = NULL) {
return $sections;
}
- function option_definition() {
+ public function option_definition() {
$options = parent::option_definition();
$options['displays'] = array('default' => array());
@@ -125,9 +125,9 @@ function option_definition() {
return $options;
}
- function options_summary(&$categories, &$options) {
+ public function optionsSummary(&$categories, &$options) {
// It is very important to call the parent function here:
- parent::options_summary($categories, $options);
+ parent::optionsSummary($categories, $options);
// Since we're childing off the 'page' type, we'll still *call* our
// category 'page' but let's override it so it says feed settings.
@@ -139,14 +139,14 @@ function options_summary(&$categories, &$options) {
),
);
- if ($this->get_option('sitename_title')) {
+ if ($this->getOption('sitename_title')) {
$options['title']['value'] = t('Using the site name');
}
// I don't think we want to give feeds menus directly.
unset($options['menu']);
- $displays = array_filter($this->get_option('displays'));
+ $displays = array_filter($this->getOption('displays'));
if (count($displays) > 1) {
$attach_to = t('Multiple displays');
}
@@ -171,7 +171,7 @@ function options_summary(&$categories, &$options) {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
// It is very important to call the parent function here.
parent::options_form($form, $form_state);
@@ -184,7 +184,7 @@ function options_form(&$form, &$form_state) {
$form['sitename_title'] = array(
'#type' => 'checkbox',
'#title' => t('Use the site name for the title'),
- '#default_value' => $this->get_option('sitename_title'),
+ '#default_value' => $this->getOption('sitename_title'),
);
$form['title'] = $title;
$form['title']['#states'] = array(
@@ -205,7 +205,7 @@ function options_form(&$form, &$form_state) {
'#type' => 'checkboxes',
'#description' => t('The feed icon will be available only to the selected displays.'),
'#options' => $displays,
- '#default_value' => $this->get_option('displays'),
+ '#default_value' => $this->getOption('displays'),
);
break;
case 'path':
@@ -217,15 +217,15 @@ function options_form(&$form, &$form_state) {
* Perform any necessary changes to the form values prior to storage.
* There is no need for this function to actually store the data.
*/
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
case 'title':
- $this->set_option('sitename_title', $form_state['values']['sitename_title']);
+ $this->setOption('sitename_title', $form_state['values']['sitename_title']);
break;
case 'displays':
- $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
+ $this->setOption($form_state['section'], $form_state['values'][$form_state['section']]);
break;
}
}
@@ -233,20 +233,20 @@ function options_submit(&$form, &$form_state) {
/**
* Attach to another view.
*/
- function attach_to($display_id) {
- $displays = $this->get_option('displays');
+ public function attachTo($display_id) {
+ $displays = $this->getOption('displays');
if (empty($displays[$display_id])) {
return;
}
// Defer to the feed style; it may put in meta information, and/or
// attach a feed icon.
- $plugin = $this->get_plugin();
+ $plugin = $this->getPlugin('style');
if ($plugin) {
$clone = $this->view->cloneView();
$clone->setDisplay($this->display->id);
$clone->buildTitle();
- $plugin->attach_to($display_id, $this->get_path(), $clone->getTitle());
+ $plugin->attach_to($display_id, $this->getPath(), $clone->getTitle());
// Clean up
$clone->destroy();
@@ -254,7 +254,7 @@ function attach_to($display_id) {
}
}
- function uses_link_display() {
+ public function usesLinkDisplay() {
return TRUE;
}
diff --git a/lib/Drupal/views/Plugin/views/display/Page.php b/lib/Drupal/views/Plugin/views/display/Page.php
index e4ca7ee5bff3..517473e459c5 100644
--- a/lib/Drupal/views/Plugin/views/display/Page.php
+++ b/lib/Drupal/views/Plugin/views/display/Page.php
@@ -39,10 +39,10 @@ class Page extends DisplayPluginBase {
/**
* The page display has a path.
*/
- function has_path() { return TRUE; }
- function uses_breadcrumb() { return TRUE; }
+ public function hasPath() { return TRUE; }
+ public function usesBreadcrumb() { return TRUE; }
- function option_definition() {
+ public function option_definition() {
$options = parent::option_definition();
$options['path'] = array('default' => '');
@@ -74,12 +74,12 @@ function option_definition() {
/**
* Add this display's path information to Drupal's menu system.
*/
- function execute_hook_menu($callbacks) {
+ public function executeHookMenu($callbacks) {
$items = array();
// Replace % with the link to our standard views argument loader
// views_arg_load -- which lives in views.module
- $bits = explode('/', $this->get_option('path'));
+ $bits = explode('/', $this->getOption('path'));
$page_arguments = array($this->view->name, $this->display->id);
$this->view->initHandlers();
$view_arguments = $this->view->argument;
@@ -98,7 +98,7 @@ function execute_hook_menu($callbacks) {
$path = implode('/', $bits);
- $access_plugin = $this->get_plugin('access');
+ $access_plugin = $this->getPlugin('access');
if (!isset($access_plugin)) {
$access_plugin = views_get_plugin('access', 'none');
}
@@ -143,7 +143,7 @@ function execute_hook_menu($callbacks) {
// Identify URL embedded arguments and correlate them to a handler
'load arguments' => array($this->view->name, $this->display->id, '%index'),
);
- $menu = $this->get_option('menu');
+ $menu = $this->getOption('menu');
if (empty($menu)) {
$menu = array('type' => 'none');
}
@@ -184,7 +184,7 @@ function execute_hook_menu($callbacks) {
// If this is a 'default' tab, check to see if we have to create teh
// parent menu item.
if ($menu['type'] == 'default tab') {
- $tab_options = $this->get_option('tab_options');
+ $tab_options = $this->getOption('tab_options');
if (!empty($tab_options['type']) && $tab_options['type'] != 'none') {
$bits = explode('/', $path);
// Remove the last piece.
@@ -232,7 +232,7 @@ function execute_hook_menu($callbacks) {
* a drupal_set_title for the page, and does a views_set_page_view
* on the view.
*/
- function execute() {
+ public function execute() {
// Let the world know that this is the page view we're using.
views_set_page_view($this->view);
@@ -264,9 +264,9 @@ function execute() {
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) {
+ public function optionsSummary(&$categories, &$options) {
// It is very important to call the parent function here:
- parent::options_summary($categories, $options);
+ parent::optionsSummary($categories, $options);
$categories['page'] = array(
'title' => t('Page settings'),
@@ -276,7 +276,7 @@ function options_summary(&$categories, &$options) {
),
);
- $path = strip_tags('/' . $this->get_option('path'));
+ $path = strip_tags('/' . $this->getOption('path'));
if (empty($path)) {
$path = t('None');
}
@@ -287,7 +287,7 @@ function options_summary(&$categories, &$options) {
'value' => views_ui_truncate($path, 24),
);
- $menu = $this->get_option('menu');
+ $menu = $this->getOption('menu');
if (!is_array($menu)) {
$menu = array('type' => 'none');
}
@@ -321,7 +321,7 @@ function options_summary(&$categories, &$options) {
/**
* Provide the default form for setting options.
*/
- function options_form(&$form, &$form_state) {
+ public function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
// It is very important to call the parent function here:
parent::options_form($form, $form_state);
@@ -332,7 +332,7 @@ function options_form(&$form, &$form_state) {
$form['path'] = array(
'#type' => 'textfield',
'#description' => t('This view will be displayed by visiting this path on your site. You may use "%" in your URL to represent values that will be used for contextual filters: For example, "node/%/feed".'),
- '#default_value' => $this->get_option('path'),
+ '#default_value' => $this->getOption('path'),
'#field_prefix' => '<span dir="ltr">' . url(NULL, array('absolute' => TRUE)),
'#field_suffix' => '</span>‎',
'#attributes' => array('dir' => 'ltr'),
@@ -345,7 +345,7 @@ function options_form(&$form, &$form_state) {
'#suffix' => '</div>',
'#tree' => TRUE,
);
- $menu = $this->get_option('menu');
+ $menu = $this->getOption('menu');
if (empty($menu)) {
$menu = array('type' => 'none', 'title' => '', 'weight' => 0);
}
@@ -466,7 +466,7 @@ function options_form(&$form, &$form_state) {
break;
case 'tab_options':
$form['#title'] .= t('Default tab options');
- $tab_options = $this->get_option('tab_options');
+ $tab_options = $this->getOption('tab_options');
if (empty($tab_options)) {
$tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
}
@@ -562,7 +562,7 @@ function options_form(&$form, &$form_state) {
}
}
- function options_validate(&$form, &$form_state) {
+ public function options_validate(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_validate($form, $form_state);
switch ($form_state['section']) {
@@ -579,7 +579,7 @@ function options_validate(&$form, &$form_state) {
$form_state['values']['path'] = trim($form_state['values']['path'], '/ ');
break;
case 'menu':
- $path = $this->get_option('path');
+ $path = $this->getOption('path');
if ($form_state['values']['menu']['type'] == 'normal' && strpos($path, '%') !== FALSE) {
form_error($form['menu']['type'], t('Views cannot create normal menu items for paths with a % in them.'));
}
@@ -599,36 +599,36 @@ function options_validate(&$form, &$form_state) {
}
}
- function options_submit(&$form, &$form_state) {
+ public function options_submit(&$form, &$form_state) {
// It is very important to call the parent function here:
parent::options_submit($form, $form_state);
switch ($form_state['section']) {
case 'path':
- $this->set_option('path', $form_state['values']['path']);
+ $this->setOption('path', $form_state['values']['path']);
break;
case 'menu':
- $this->set_option('menu', $form_state['values']['menu']);
+ $this->setOption('menu', $form_state['values']['menu']);
// send ajax form to options page if we use it.
if ($form_state['values']['menu']['type'] == 'default tab') {
views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('tab_options'));
}
break;
case 'tab_options':
- $this->set_option('tab_options', $form_state['values']['tab_options']);
+ $this->setOption('tab_options', $form_state['values']['tab_options']);
break;
}
}
- function validate() {
+ public function validate() {
$errors = parent::validate();
- $menu = $this->get_option('menu');
+ $menu = $this->getOption('menu');
if (!empty($menu['type']) && $menu['type'] != 'none' && empty($menu['title'])) {
$errors[] = t('Display @display is set to use a menu but the menu link text is not set.', array('@display' => $this->display->display_title));
}
if ($menu['type'] == 'default tab') {
- $tab_options = $this->get_option('tab_options');
+ $tab_options = $this->getOption('tab_options');
if (!empty($tab_options['type']) && $tab_options['type'] != 'none' && empty($tab_options['title'])) {
$errors[] = t('Display @display is set to use a parent menu but the parent menu link text is not set.', array('@display' => $this->display->display_title));
}
@@ -637,7 +637,7 @@ function validate() {
return $errors;
}
- function get_argument_text() {
+ public function getArgumentText() {
return array(
'filter value not present' => t('When the filter value is <em>NOT</em> in the URL'),
'filter value present' => t('When the filter value <em>IS</em> in the URL or a default is provided'),
@@ -645,7 +645,7 @@ function get_argument_text() {
);
}
- function get_pager_text() {
+ public function getPagerText() {
return array(
'items per page title' => t('Items per page'),
'items per page description' => t('The number of items to display per page. Enter 0 for no limit.')
diff --git a/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index 9985f1e5137e..198adcd5af6f 100644
--- a/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -17,7 +17,7 @@
*/
abstract class DisplayExtenderPluginBase extends PluginBase {
- function init(&$view, &$display) {
+ public function init(&$view, &$display) {
$this->view = $view;
$this->display = $display;
}
@@ -25,44 +25,44 @@ function init(&$view, &$display) {
/**
* Provide a form to edit options for this plugin.
*/
- function options_definition_alter(&$options) { }
+ public function options_definition_alter(&$options) { }
/**
* Provide a form to edit options for this plugin.
*/
- function options_form(&$form, &$form_state) { }
+ public function options_form(&$form, &$form_state) { }
/**
* Validate the options form.
*/
- function options_validate(&$form, &$form_state) { }
+ public function options_validate(&$form, &$form_state) { }
/**
* Handle any special handling on the validate form.
*/
- function options_submit(&$form, &$form_state) { }
+ public function options_submit(&$form, &$form_state) { }
/**
* Set up any variables on the view prior to execution.
*/
- function pre_execute() { }
+ public function pre_execute() { }
/**
* Inject anything into the query that the display_extender handler needs.
*/
- function query() { }
+ public function query() { }
/**
* Provide the default summary for options in the views UI.
*
* This output is returned as an array.
*/
- function options_summary(&$categories, &$options) { }
+ public function optionsSummary(&$categories, &$options) { }
/**
* Static member function to list which sections are defaultable
* and what items each section contains.
*/
- function defaultable_sections(&$sections, $section = NULL) { }
+ public function defaultableSections(&$sections, $section = NULL) { }
}
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index a36ee66f4838..40fecf795c73 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -152,7 +152,7 @@ function render_exposed_form($block = FALSE) {
// Some types of displays (eg. attachments) may wish to use the exposed
// filters of their parent displays instead of showing an additional
// exposed filter form for the attachment as well as that for the parent.
- if (!$this->view->display_handler->displays_exposed() || (!$block && $this->view->display_handler->get_option('exposed_block'))) {
+ if (!$this->view->display_handler->displaysExposed() || (!$block && $this->view->display_handler->getOption('exposed_block'))) {
unset($form_state['rerender']);
}
@@ -164,7 +164,7 @@ function render_exposed_form($block = FALSE) {
$form = drupal_build_form('views_exposed_form', $form_state);
$output = drupal_render($form);
- if (!$this->view->display_handler->displays_exposed() || (!$block && $this->view->display_handler->get_option('exposed_block'))) {
+ if (!$this->view->display_handler->displaysExposed() || (!$block && $this->view->display_handler->getOption('exposed_block'))) {
return "";
}
else {
@@ -257,7 +257,7 @@ function exposed_form_alter(&$form, &$form_state) {
}
}
- $pager = $this->view->display_handler->get_plugin('pager');
+ $pager = $this->view->display_handler->getPlugin('pager');
if ($pager) {
$pager->exposed_form_alter($form, $form_state);
$form_state['pager_plugin'] = $pager;
@@ -311,7 +311,7 @@ function reset_form(&$form, &$form_state) {
// default display. If they are, store them on this display. This way,
// multiple displays in the same view can share the same filters and
// remember settings.
- $display_id = ($this->view->display_handler->is_defaulted('filters')) ? 'default' : $this->view->current_display;
+ $display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
if (isset($_SESSION['views'][$this->view->name][$display_id])) {
unset($_SESSION['views'][$this->view->name][$display_id]);
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
index 19f0462b3055..3ec4f9eeb074 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/InputRequired.php
@@ -88,7 +88,7 @@ function pre_render($values) {
$this->display->handler->handlers['empty'] = array(
'area' => $handler,
);
- $this->display->handler->set_option('empty', array('text' => $options));
+ $this->display->handler->setOption('empty', array('text' => $options));
}
}
diff --git a/lib/Drupal/views/Plugin/views/field/ContextualLinks.php b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
index f8a215601894..7aedacb321ab 100644
--- a/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
+++ b/lib/Drupal/views/Plugin/views/field/ContextualLinks.php
@@ -30,7 +30,7 @@ function option_definition() {
}
function options_form(&$form, &$form_state) {
- $all_fields = $this->view->display_handler->get_field_labels();
+ $all_fields = $this->view->display_handler->getFieldLabels();
// Offer to include only those fields that follow this one.
$field_options = array_slice($all_fields, 0, array_search($this->options['id'], array_keys($all_fields)));
$form['fields'] = array(
diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index 6c318dc7e50d..9829edbb6ce3 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -850,7 +850,7 @@ function options_form(&$form, &$form_state) {
// Get a list of the available fields and arguments for token replacement.
$options = array();
- foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
+ foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
$options[t('Fields')]["[$field]"] = $handler->ui_name();
// We only use fields up to (and including) this one.
if ($field == $this->options['id']) {
@@ -858,7 +858,7 @@ function options_form(&$form, &$form_state) {
}
}
$count = 0; // This lets us prepare the key as we want it printed.
- foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
$options[t('Arguments')]['%' . ++$count] = t('@argument title', array('@argument' => $handler->ui_name()));
$options[t('Arguments')]['!' . $count] = t('@argument input', array('@argument' => $handler->ui_name()));
}
@@ -1468,7 +1468,7 @@ function get_render_tokens($item) {
$tokens = $this->view->build_info['substitutions'];
}
$count = 0;
- foreach ($this->view->display_handler->get_handlers('argument') as $arg => $handler) {
+ foreach ($this->view->display_handler->getHandlers('argument') as $arg => $handler) {
$token = '%' . ++$count;
if (!isset($tokens[$token])) {
$tokens[$token] = '';
@@ -1484,7 +1484,7 @@ function get_render_tokens($item) {
$tokens += $this->get_token_values_recursive(drupal_container()->get('request')->query->all());
// Now add replacements for our fields.
- foreach ($this->view->display_handler->get_handlers('field') as $field => $handler) {
+ foreach ($this->view->display_handler->getHandlers('field') as $field => $handler) {
if (isset($handler->last_render)) {
$tokens["[$field]"] = $handler->last_render;
}
diff --git a/lib/Drupal/views/Plugin/views/filter/Combine.php b/lib/Drupal/views/Plugin/views/filter/Combine.php
index 13f72354e085..01bded9818ee 100644
--- a/lib/Drupal/views/Plugin/views/filter/Combine.php
+++ b/lib/Drupal/views/Plugin/views/filter/Combine.php
@@ -39,7 +39,7 @@ function options_form(&$form, &$form_state) {
// Allow to choose all fields as possible
if ($this->view->style_plugin->usesFields()) {
$options = array();
- foreach ($this->view->display_handler->get_handlers('field') as $name => $field) {
+ foreach ($this->view->display_handler->getHandlers('field') as $name => $field) {
$options[$name] = $field->ui_name(TRUE);
}
if ($options) {
diff --git a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index bfa6285475db..e71fb26eb210 100644
--- a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -99,7 +99,7 @@ function init(&$view, &$options) {
// If there are relationships in the view, allow empty should be true
// so that we can do IS NULL checks on items. Not all filters respect
// allow empty, but string and numeric do and that covers enough.
- if ($this->view->display_handler->get_option('relationships')) {
+ if ($this->view->display_handler->getOption('relationships')) {
$this->definition['allow empty'] = TRUE;
}
}
@@ -583,7 +583,7 @@ function expose_validate($form, &$form_state) {
form_error($form['expose']['identifier'], t('This identifier is not allowed.'));
}
- if (!$this->view->display_handler->is_identifier_unique($form_state['id'], $form_state['values']['options']['expose']['identifier'])) {
+ if (!$this->view->display_handler->isIdentifierUnique($form_state['id'], $form_state['values']['options']['expose']['identifier'])) {
form_error($form['expose']['identifier'], t('This identifier is used by another handler.'));
}
}
@@ -601,7 +601,7 @@ function build_group_validate($form, &$form_state) {
form_error($form['group_info']['identifier'], t('This identifier is not allowed.'));
}
- if (!$this->view->display_handler->is_identifier_unique($form_state['id'], $form_state['values']['options']['group_info']['identifier'])) {
+ if (!$this->view->display_handler->isIdentifierUnique($form_state['id'], $form_state['values']['options']['group_info']['identifier'])) {
form_error($form['group_info']['identifier'], t('This identifier is used by another handler.'));
}
}
@@ -1236,7 +1236,7 @@ function store_group_input($input, $status) {
// Figure out which display id is responsible for the filters, so we
// know where to look for session stored values.
- $display_id = ($this->view->display_handler->is_defaulted('filters')) ? 'default' : $this->view->current_display;
+ $display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
// false means that we got a setting that means to recuse ourselves,
// so we should erase whatever happened to be there.
@@ -1327,7 +1327,7 @@ function store_exposed_input($input, $status) {
// Figure out which display id is responsible for the filters, so we
// know where to look for session stored values.
- $display_id = ($this->view->display_handler->is_defaulted('filters')) ? 'default' : $this->view->current_display;
+ $display_id = ($this->view->display_handler->isDefaulted('filters')) ? 'default' : $this->view->current_display;
// shortcut test.
$operator = !empty($this->options['expose']['use_operator']) && !empty($this->options['expose']['operator_id']);
diff --git a/lib/Drupal/views/Plugin/views/pager/Full.php b/lib/Drupal/views/Plugin/views/pager/Full.php
index 59ef860b8803..95727b6b6a07 100644
--- a/lib/Drupal/views/Plugin/views/pager/Full.php
+++ b/lib/Drupal/views/Plugin/views/pager/Full.php
@@ -67,7 +67,7 @@ function option_definition() {
*/
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $pager_text = $this->display->handler->get_pager_text();
+ $pager_text = $this->display->handler->getPagerText();
$form['items_per_page'] = array(
'#title' => $pager_text['items per page title'],
'#type' => 'number',
diff --git a/lib/Drupal/views/Plugin/views/pager/Some.php b/lib/Drupal/views/Plugin/views/pager/Some.php
index e7cecca5f495..cc6f6c27f60c 100644
--- a/lib/Drupal/views/Plugin/views/pager/Some.php
+++ b/lib/Drupal/views/Plugin/views/pager/Some.php
@@ -44,7 +44,7 @@ function option_definition() {
*/
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $pager_text = $this->display->handler->get_pager_text();
+ $pager_text = $this->display->handler->getPagerText();
$form['items_per_page'] = array(
'#title' => $pager_text['items per page title'],
'#type' => 'textfield',
diff --git a/lib/Drupal/views/Plugin/views/row/Fields.php b/lib/Drupal/views/Plugin/views/row/Fields.php
index 74b9f6d34654..6d79ad8dd862 100644
--- a/lib/Drupal/views/Plugin/views/row/Fields.php
+++ b/lib/Drupal/views/Plugin/views/row/Fields.php
@@ -50,7 +50,7 @@ function option_definition() {
*/
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $options = $this->display->handler->get_field_labels();
+ $options = $this->display->handler->getFieldLabels();
if (empty($this->options['inline'])) {
$this->options['inline'] = array();
diff --git a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index eb6af663a795..42be73d31f1e 100644
--- a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -46,7 +46,7 @@ function init(&$view, &$display, $options = NULL) {
$this->display = &$display;
// Overlay incoming options on top of defaults
- $this->unpack_options($this->options, isset($options) ? $options : $display->handler->get_option('row_options'));
+ $this->unpack_options($this->options, isset($options) ? $options : $display->handler->getOption('row_options'));
}
/**
@@ -78,7 +78,7 @@ function options_form(&$form, &$form_state) {
// A whole bunch of code to figure out what relationships are valid for
// this item.
- $relationships = $view->display_handler->get_option('relationships');
+ $relationships = $view->display_handler->getOption('relationships');
$relationship_options = array();
foreach ($relationships as $relationship) {
diff --git a/lib/Drupal/views/Plugin/views/row/RssFields.php b/lib/Drupal/views/Plugin/views/row/RssFields.php
index 73ec4a299775..8077bf8f08f0 100644
--- a/lib/Drupal/views/Plugin/views/row/RssFields.php
+++ b/lib/Drupal/views/Plugin/views/row/RssFields.php
@@ -46,7 +46,7 @@ function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
$initial_labels = array('' => t('- None -'));
- $view_fields_labels = $this->display->handler->get_field_labels();
+ $view_fields_labels = $this->display->handler->getFieldLabels();
$view_fields_labels = array_merge($initial_labels, $view_fields_labels);
$form['title_field'] = array(
diff --git a/lib/Drupal/views/Plugin/views/style/Rss.php b/lib/Drupal/views/Plugin/views/style/Rss.php
index 18a35cf06b19..6f14d66cac91 100644
--- a/lib/Drupal/views/Plugin/views/style/Rss.php
+++ b/lib/Drupal/views/Plugin/views/style/Rss.php
@@ -42,7 +42,7 @@ function attach_to($display_id, $path, $title) {
$url_options['absolute'] = TRUE;
$url = url($this->view->getUrl(NULL, $path), $url_options);
- if ($display->has_path()) {
+ if ($display->hasPath()) {
if (empty($this->preview)) {
drupal_add_feed($url, $title);
}
diff --git a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index 279f1fd58e38..3454b9ef400f 100644
--- a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -94,10 +94,10 @@ function init(&$view, &$display, $options = NULL) {
$this->display = &$display;
// Overlay incoming options on top of defaults
- $this->unpack_options($this->options, isset($options) ? $options : $display->handler->get_option('style_options'));
+ $this->unpack_options($this->options, isset($options) ? $options : $display->handler->getOption('style_options'));
- if ($this->usesRowPlugin() && $display->handler->get_option('row_plugin')) {
- $this->row_plugin = $display->handler->get_plugin('row');
+ if ($this->usesRowPlugin() && $display->handler->getOption('row_plugin')) {
+ $this->row_plugin = $display->handler->getPlugin('row');
}
$this->options += array(
@@ -242,7 +242,7 @@ function options_form(&$form, &$form_state) {
// @TODO: Document "usesGrouping" in docs.php when docs.php is written.
if ($this->usesFields() && $this->usesGrouping()) {
$options = array('' => t('- None -'));
- $field_labels = $this->display->handler->get_field_labels(TRUE);
+ $field_labels = $this->display->handler->getFieldLabels(TRUE);
$options += $field_labels;
// If there are no fields, we can't group on them.
if (count($options) > 1) {
@@ -661,7 +661,7 @@ function validate() {
$errors = parent::validate();
if ($this->usesRowPlugin()) {
- $plugin = $this->display->handler->get_plugin('row');
+ $plugin = $this->display->handler->getPlugin('row');
if (empty($plugin)) {
$errors[] = t('Style @style requires a row style but the row plugin is invalid.', array('@style' => $this->definition['title']));
}
diff --git a/lib/Drupal/views/Plugin/views/style/Table.php b/lib/Drupal/views/Plugin/views/style/Table.php
index 402b02f4ac69..a9e9b1dc00be 100644
--- a/lib/Drupal/views/Plugin/views/style/Table.php
+++ b/lib/Drupal/views/Plugin/views/style/Table.php
@@ -164,7 +164,7 @@ function build_sort_post() {
function sanitize_columns($columns, $fields = NULL) {
$sanitized = array();
if ($fields === NULL) {
- $fields = $this->display->handler->get_option('fields');
+ $fields = $this->display->handler->getOption('fields');
}
// Preconfigure the sanitized array so that the order is retained.
foreach ($fields as $field => $info) {
@@ -197,7 +197,7 @@ function sanitize_columns($columns, $fields = NULL) {
*/
function options_form(&$form, &$form_state) {
parent::options_form($form, $form_state);
- $handlers = $this->display->handler->get_handlers('field');
+ $handlers = $this->display->handler->getHandlers('field');
if (empty($handlers)) {
$form['error_markup'] = array(
'#markup' => '<div class="error messages">' . t('You need at least one field before you can configure your table settings') . '</div>',
@@ -233,7 +233,7 @@ function options_form(&$form, &$form_state) {
$columns = $this->sanitize_columns($this->options['columns']);
// Create an array of allowed columns from the data we know:
- $field_names = $this->display->handler->get_field_labels();
+ $field_names = $this->display->handler->getFieldLabels();
if (isset($this->options['default'])) {
$default = $this->options['default'];
diff --git a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 9dd96fa3326c..ebcf3b39620f 100644
--- a/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -618,7 +618,7 @@ protected function add_displays($view, $display_options, $form, $form_state) {
// Display: Master
$default_display = $view->new_display('default', 'Master', 'default');
foreach ($display_options['default'] as $option => $value) {
- $default_display->set_option($option, $value);
+ $default_display->setOption($option, $value);
}
// Display: Page
@@ -896,12 +896,12 @@ protected function set_default_options($options, $display, $default_display) {
foreach ($options as $option => $value) {
// If the default display supports this option, set the value there.
// Otherwise, set it on the provided display.
- $default_value = $default_display->get_option($option);
+ $default_value = $default_display->getOption($option);
if (isset($default_value)) {
- $default_display->set_option($option, $value);
+ $default_display->setOption($option, $value);
}
else {
- $display->set_option($option, $value);
+ $display->setOption($option, $value);
}
}
}
@@ -932,12 +932,12 @@ protected function set_override_options($options, $display, $default_display) {
foreach ($options as $option => $value) {
// Only override the default value if it is different from the value that
// was provided.
- $default_value = $default_display->get_option($option);
+ $default_value = $default_display->getOption($option);
if (!isset($default_value)) {
- $display->set_option($option, $value);
+ $display->setOption($option, $value);
}
elseif ($default_value !== $value) {
- $display->override_option($option, $value);
+ $display->overrideOption($option, $value);
}
}
}
diff --git a/lib/Drupal/views/Tests/BasicTest.php b/lib/Drupal/views/Tests/BasicTest.php
index f61ec280fde3..f89a9a3be53d 100644
--- a/lib/Drupal/views/Tests/BasicTest.php
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -50,7 +50,7 @@ public function testSimpleFiltering() {
$view = $this->getBasicView();
// Add a filter.
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'operator' => '<',
'value' => array(
@@ -108,7 +108,7 @@ public function testSimpleArgument() {
$view = $this->getBasicView();
// Add a argument.
- $view->display['default']->handler->override_option('arguments', array(
+ $view->display['default']->handler->overrideOption('arguments', array(
'age' => array(
'default_action' => 'ignore',
'style_plugin' => 'default_summary',
diff --git a/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
index c9c4a1d9dfcf..07f99fb70992 100644
--- a/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+++ b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
@@ -33,7 +33,7 @@ public function testAreaText() {
// add a text header
$string = $this->randomName();
- $view->display['default']->handler->override_option('header', array(
+ $view->display['default']->handler->overrideOption('header', array(
'area' => array(
'id' => 'area',
'table' => 'views',
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index 924337cef875..c94e2f7d4b63 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -39,7 +39,7 @@ public function testAreaText() {
// Add a null argument.
$string = $this->randomString();
- $view->display['default']->handler->override_option('arguments', array(
+ $view->display['default']->handler->overrideOption('arguments', array(
'null' => array(
'id' => 'null',
'table' => 'views',
@@ -64,7 +64,7 @@ public function testAreaText() {
// Add a argument, which has null as handler.
$string = $this->randomString();
- $view->display['default']->handler->override_option('arguments', array(
+ $view->display['default']->handler->overrideOption('arguments', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index 1226e3ad0e96..6e2f69185d53 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -43,7 +43,7 @@ function viewsData() {
public function testFieldBoolean() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index 01be65c6af96..63969dcd8409 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -28,7 +28,7 @@ protected function setUp() {
function testSimple() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'counter' => array(
'id' => 'counter',
'table' => 'views',
@@ -51,7 +51,7 @@ function testSimple() {
$view = $this->getBasicView();
$rand_start = rand(5, 10);
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'counter' => array(
'id' => 'counter',
'table' => 'views',
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index 430a99fe0da2..e3ae177f06ba 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -37,7 +37,7 @@ public function testFieldCustom() {
// Alter the text of the field to a random string.
$random = $this->randomName();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index 684e70aabcb4..844c18becc35 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -35,7 +35,7 @@ function viewsData() {
public function testFieldDate() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'created' => array(
'id' => 'created',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 388a2fe8d165..9db396deca8c 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -48,7 +48,7 @@ function viewsData() {
public function testFieldFileSize() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index b62da4818b65..b7c40e4224dd 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -35,7 +35,7 @@ function viewsData() {
public function testFieldUrl() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -53,7 +53,7 @@ public function testFieldUrl() {
$view->delete();
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index 27c89ef4619a..4e7ad93ade5c 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -49,7 +49,7 @@ function viewsData() {
public function testFieldXss() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 512ec0e8225b..1d5b035885cf 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -49,7 +49,7 @@ public function testFilterCombineContains() {
$view = $this->getBasicView();
// Change the filtering.
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'combine',
'table' => 'views',
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index 9de1c7f9b5fa..a06275a36988 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -41,7 +41,7 @@ function testEqual() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -68,7 +68,7 @@ public function testEqualGroupedExposed() {
// Filter: Name, Operator: =, Value: Ringo
$filters['name']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@@ -83,7 +83,7 @@ function testNotEqual() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -119,7 +119,7 @@ public function testEqualGroupedNotExposed() {
// Filter: Name, Operator: !=, Value: Ringo
$filters['name']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index 2ca4e19a6657..d988a95e4cef 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -37,7 +37,7 @@ public function testFilterInOperatorSimple() {
$view = $this->getBasicView();
// Add a in_operator ordering.
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'field' => 'age',
@@ -70,7 +70,7 @@ public function testFilterInOperatorSimple() {
$view = $this->getBasicView();
// Add a in_operator ordering.
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'field' => 'age',
@@ -111,7 +111,7 @@ public function testFilterInOperatorGroupedExposedSimple() {
// Filter: Age, Operator: in, Value: 26, 30
$filters['age']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -140,7 +140,7 @@ public function testFilterNotInOperatorGroupedExposedSimple() {
// Filter: Age, Operator: in, Value: 26, 30
$filters['age']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
diff --git a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index 2a79c80aebee..19aa80b36f41 100644
--- a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -45,7 +45,7 @@ public function testFilterNumericSimple() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
@@ -73,7 +73,7 @@ public function testFilterNumericExposedGroupedSimple() {
// Filter: Age, Operator: =, Value: 28
$filters['age']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@@ -89,7 +89,7 @@ public function testFilterNumericBetween() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
@@ -125,7 +125,7 @@ public function testFilterNumericBetween() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
@@ -164,7 +164,7 @@ public function testFilterNumericExposedGroupedBetween() {
// Filter: Age, Operator: between, Value: 26 and 29
$filters['age']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -192,7 +192,7 @@ public function testFilterNumericExposedGroupedNotBetween() {
// Filter: Age, Operator: between, Value: 26 and 29
$filters['age']['group_info']['default_group'] = 3;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -218,7 +218,7 @@ public function testFilterNumericEmpty() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
@@ -237,7 +237,7 @@ public function testFilterNumericEmpty() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
@@ -281,7 +281,7 @@ public function testFilterNumericExposedGroupedEmpty() {
// Filter: Age, Operator: empty, Value:
$filters['age']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -297,7 +297,7 @@ public function testFilterNumericExposedGroupedNotEmpty() {
// Filter: Age, Operator: empty, Value:
$filters['age']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -330,7 +330,7 @@ public function testFilterNumericExposedGroupedNotEmpty() {
public function testAllowEmpty() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 161e1759251c..b7a1c1cdd8bc 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -82,7 +82,7 @@ function testFilterStringEqual() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -109,7 +109,7 @@ function testFilterStringGroupedExposedEqual() {
// Filter: Name, Operator: =, Value: Ringo
$filters['name']['group_info']['default_group'] = 1;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -126,7 +126,7 @@ function testFilterStringNotEqual() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -163,7 +163,7 @@ function testFilterStringGroupedExposedNotEqual() {
$filters['name']['group_info']['default_group'] = '2';
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -189,7 +189,7 @@ function testFilterStringContains() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -217,7 +217,7 @@ function testFilterStringGroupedExposedContains() {
// Filter: Name, Operator: contains, Value: ing
$filters['name']['group_info']['default_group'] = '3';
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -235,7 +235,7 @@ function testFilterStringWord() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -261,7 +261,7 @@ function testFilterStringWord() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -289,7 +289,7 @@ function testFilterStringGroupedExposedWord() {
// Filter: Name, Operator: contains, Value: ing
$filters['name']['group_info']['default_group'] = '3';
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -308,7 +308,7 @@ function testFilterStringGroupedExposedWord() {
// Filter: Description, Operator: contains, Value: actor
$filters['description']['group_info']['default_group'] = '1';
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@@ -326,7 +326,7 @@ function testFilterStringStarts() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -353,7 +353,7 @@ function testFilterStringGroupedExposedStarts() {
// Filter: Name, Operator: starts, Value: George
$filters['description']['group_info']['default_group'] = 2;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -369,7 +369,7 @@ function testFilterStringNotStarts() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -403,7 +403,7 @@ function testFilterStringGroupedExposedNotStarts() {
// Filter: Name, Operator: not_starts, Value: George
$filters['description']['group_info']['default_group'] = 3;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -426,7 +426,7 @@ function testFilterStringEnds() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -456,7 +456,7 @@ function testFilterStringGroupedExposedEnds() {
// Filter: Descriptino, Operator: ends, Value: Beatles
$filters['description']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -475,7 +475,7 @@ function testFilterStringNotEnds() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -506,7 +506,7 @@ function testFilterStringGroupedExposedNotEnds() {
// Filter: Description, Operator: not_ends, Value: Beatles
$filters['description']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -526,7 +526,7 @@ function testFilterStringNot() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -558,7 +558,7 @@ function testFilterStringGroupedExposedNot() {
// Filter: Description, Operator: not (does not contains), Value: Beatles
$filters['description']['group_info']['default_group'] = 6;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
@@ -579,7 +579,7 @@ function testFilterStringShorter() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -609,7 +609,7 @@ function testFilterStringGroupedExposedShorter() {
// Filter: Name, Operator: shorterthan, Value: 5
$filters['name']['group_info']['default_group'] = 4;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@@ -627,7 +627,7 @@ function testFilterStringLonger() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -654,7 +654,7 @@ function testFilterStringGroupedExposedLonger() {
// Filter: Name, Operator: longerthan, Value: 4
$filters['name']['group_info']['default_group'] = 5;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
@@ -670,7 +670,7 @@ function testFilterStringEmpty() {
$view = $this->getBasicView();
// Change the filtering
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
'table' => 'views_test',
@@ -696,7 +696,7 @@ function testFilterStringGroupedExposedEmpty() {
// Filter: Description, Operator: empty, Value:
$filters['description']['group_info']['default_group'] = 7;
$view->setDisplay('page_1');
- $view->display['page_1']->handler->override_option('filters', $filters);
+ $view->display['page_1']->handler->overrideOption('filters', $filters);
$this->executeView($view);
$resultset = array(
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index 81af36cc2c19..fd131ea19f71 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -157,7 +157,7 @@ public function testDateOrdering() {
$view = $this->getBasicView();
// Change the fields.
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -173,7 +173,7 @@ public function testDateOrdering() {
));
// Change the ordering
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'created' => array(
'id' => 'created',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index 6bc8b490c081..3b89fb9fd925 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -49,7 +49,7 @@ protected function getBasicRandomView() {
$view = $this->getBasicView();
// Add a random ordering.
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'random' => array(
'id' => 'random',
'field' => 'random',
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index d663e0bbf2f6..58604958ec93 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -33,7 +33,7 @@ public function testNumericOrdering() {
$view = $this->getBasicView();
// Change the ordering
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'age' => array(
'order' => 'ASC',
'id' => 'age',
@@ -56,7 +56,7 @@ public function testNumericOrdering() {
$view = $this->getBasicView();
// Reverse the ordering
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'age' => array(
'order' => 'DESC',
'id' => 'age',
@@ -84,7 +84,7 @@ public function testStringOrdering() {
$view = $this->getBasicView();
// Change the ordering
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'name' => array(
'order' => 'ASC',
'id' => 'name',
@@ -107,7 +107,7 @@ public function testStringOrdering() {
$view = $this->getBasicView();
// Reverse the ordering
- $view->display['default']->handler->override_option('sorts', array(
+ $view->display['default']->handler->overrideOption('sorts', array(
'name' => array(
'order' => 'DESC',
'id' => 'name',
diff --git a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
index 47b170149db3..f82b0d16eaa4 100644
--- a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
+++ b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
@@ -27,7 +27,7 @@ public static function getInfo() {
public function testFilter() {
foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('arguments', array(
+ $view->display['default']->handler->overrideOption('arguments', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Language/FieldLanguage.php b/lib/Drupal/views/Tests/Language/FieldLanguage.php
index 04592110f8f9..e60438c374c0 100644
--- a/lib/Drupal/views/Tests/Language/FieldLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FieldLanguage.php
@@ -26,7 +26,7 @@ public static function getInfo() {
public function testField() {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Language/FilterLanguage.php b/lib/Drupal/views/Tests/Language/FilterLanguage.php
index 58f54bc8fab0..7717e1f53483 100644
--- a/lib/Drupal/views/Tests/Language/FilterLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FilterLanguage.php
@@ -27,7 +27,7 @@ public static function getInfo() {
public function testFilter() {
foreach (array('en' => 'John', 'xx-lolspeak' => 'George') as $langcode => $name) {
$view = $this->getBasicView();
- $view->display['default']->handler->override_option('filters', array(
+ $view->display['default']->handler->overrideOption('filters', array(
'langcode' => array(
'id' => 'langcode',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 80a94c8f6bd4..d9ec166cb077 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -58,7 +58,7 @@ function testAccessPerm() {
$view = $this->view_access_perm();
$view->setDisplay('default');
- $access_plugin = $view->display_handler->get_plugin('access');
+ $access_plugin = $view->display_handler->getPlugin('access');
$this->assertTrue($view->display_handler->access($this->admin_user), t('Admin-Account should be able to access the view everytime'));
$this->assertFalse($view->display_handler->access($this->web_user));
@@ -72,7 +72,7 @@ function testAccessRole() {
$view = $this->view_access_role();
$view->setDisplay('default');
- $access_plugin = $view->display_handler->get_plugin('access');
+ $access_plugin = $view->display_handler->getPlugin('access');
$this->assertTrue($view->display_handler->access($this->admin_user), t('Admin-Account should be able to access the view everytime'));
$this->assertFalse($view->display_handler->access($this->web_user));
@@ -90,7 +90,7 @@ function testStaticAccessPlugin() {
$view = $this->view_access_static();
$view->setDisplay('default');
- $access_plugin = $view->display_handler->get_plugin('access');
+ $access_plugin = $view->display_handler->getPlugin('access');
$this->assertFalse($access_plugin->access($this->normal_user));
@@ -121,7 +121,7 @@ function testDynamicAccessPlugin() {
variable_set('test_dynamic_access_argument2', $argument2);
$view->setDisplay('default');
- $access_plugin = $view->display_handler->get_plugin('access');
+ $access_plugin = $view->display_handler->getPlugin('access');
$this->assertFalse($access_plugin->access($this->normal_user));
diff --git a/lib/Drupal/views/Tests/Plugin/CacheTest.php b/lib/Drupal/views/Tests/Plugin/CacheTest.php
index 76d8ac57896c..8bae69fdaa8d 100644
--- a/lib/Drupal/views/Tests/Plugin/CacheTest.php
+++ b/lib/Drupal/views/Tests/Plugin/CacheTest.php
@@ -44,7 +44,7 @@ protected function getBasicView() {
// Set up the fields we need.
$display = $view->new_display('default', 'Master', 'default');
- $display->override_option('fields', array(
+ $display->overrideOption('fields', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
@@ -66,7 +66,7 @@ protected function getBasicView() {
));
// Set up the sort order.
- $display->override_option('sorts', array(
+ $display->overrideOption('sorts', array(
'id' => array(
'order' => 'ASC',
'id' => 'id',
@@ -88,7 +88,7 @@ function testTimeCaching() {
// Create a basic result which just 2 results.
$view = $this->getBasicView();
$view->setDisplay();
- $view->display_handler->override_option('cache', array(
+ $view->display_handler->overrideOption('cache', array(
'type' => 'time',
'results_lifespan' => '3600',
'output_lifespan' => '3600',
@@ -109,7 +109,7 @@ function testTimeCaching() {
// The Result should be the same as before, because of the caching.
$view = $this->getBasicView();
$view->setDisplay();
- $view->display_handler->override_option('cache', array(
+ $view->display_handler->overrideOption('cache', array(
'type' => 'time',
'results_lifespan' => '3600',
'output_lifespan' => '3600',
@@ -129,7 +129,7 @@ function testNoneCaching() {
// Create a basic result which just 2 results.
$view = $this->getBasicView();
$view->setDisplay();
- $view->display_handler->override_option('cache', array(
+ $view->display_handler->overrideOption('cache', array(
'type' => 'none',
));
@@ -149,7 +149,7 @@ function testNoneCaching() {
// The Result changes, because the view is not cached.
$view = $this->getBasicView();
$view->setDisplay();
- $view->display_handler->override_option('cache', array(
+ $view->display_handler->overrideOption('cache', array(
'type' => 'none',
));
@@ -168,7 +168,7 @@ function testHeaderStorage() {
$view = $this->getBasicView();
$view->initDisplay();
$view->name = 'test_cache_header_storage';
- $view->display_handler->override_option('cache', array(
+ $view->display_handler->overrideOption('cache', array(
'type' => 'time',
'output_lifespan' => '3600',
));
diff --git a/lib/Drupal/views/Tests/Plugin/DisplayTest.php b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
index 8af67b431c4d..c937e0fb960b 100644
--- a/lib/Drupal/views/Tests/Plugin/DisplayTest.php
+++ b/lib/Drupal/views/Tests/Plugin/DisplayTest.php
@@ -30,9 +30,9 @@ function testFilterGroupsOverriding() {
$view->initDisplay();
// mark is as overridden, yes FALSE, means overridden.
- $view->display['page']->handler->set_override('filter_groups', FALSE);
- $this->assertFalse($view->display['page']->handler->is_defaulted('filter_groups'), "Take sure that 'filter_groups' is marked as overridden.");
- $this->assertFalse($view->display['page']->handler->is_defaulted('filters'), "Take sure that 'filters'' is marked as overridden.");
+ $view->display['page']->handler->setOverride('filter_groups', FALSE);
+ $this->assertFalse($view->display['page']->handler->isDefaulted('filter_groups'), "Take sure that 'filter_groups' is marked as overridden.");
+ $this->assertFalse($view->display['page']->handler->isDefaulted('filters'), "Take sure that 'filters'' is marked as overridden.");
}
/**
diff --git a/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php b/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
index 8af63d8944e2..e52d5e6cb642 100644
--- a/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
+++ b/lib/Drupal/views/Tests/Plugin/ExposedFormTest.php
@@ -45,10 +45,10 @@ public function testRenameResetButton() {
$view = views_get_view('test_rename_reset_button');
$view->setDisplay('default');
- $exposed_form = $view->display_handler->get_option('exposed_form');
+ $exposed_form = $view->display_handler->getOption('exposed_form');
$exposed_form['options']['reset_button_label'] = $expected_label = $this->randomName();
$exposed_form['options']['reset_button'] = TRUE;
- $view->display_handler->set_option('exposed_form', $exposed_form);
+ $view->display_handler->setOption('exposed_form', $exposed_form);
$view->save();
views_invalidate_cache();
diff --git a/lib/Drupal/views/Tests/Plugin/PagerTest.php b/lib/Drupal/views/Tests/Plugin/PagerTest.php
index 70aa9484a42a..117a8f0db570 100644
--- a/lib/Drupal/views/Tests/Plugin/PagerTest.php
+++ b/lib/Drupal/views/Tests/Plugin/PagerTest.php
@@ -143,7 +143,7 @@ public function testNoLimit() {
'offset' => 3,
),
);
- $view->display_handler->set_option('pager', $pager);
+ $view->display_handler->setOption('pager', $pager);
$this->executeView($view);
$this->assertEqual(count($view->result), 8, 'Make sure that every item beside the first three is returned in the result');
@@ -221,7 +221,7 @@ public function testLimit() {
'items_per_page' => 5,
),
);
- $view->display_handler->set_option('pager', $pager);
+ $view->display_handler->setOption('pager', $pager);
$this->executeView($view);
$this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
@@ -280,7 +280,7 @@ public function testNormalPager() {
'items_per_page' => 5,
),
);
- $view->display_handler->set_option('pager', $pager);
+ $view->display_handler->setOption('pager', $pager);
$this->executeView($view);
$this->assertEqual(count($view->result), 3, 'Make sure that only a certain count of items is returned');
@@ -308,7 +308,7 @@ public function testNormalPager() {
),
);
- $view->display_handler->set_option('pager', $pager);
+ $view->display_handler->setOption('pager', $pager);
$this->executeView($view);
$this->assertEqual($view->pager->get_items_per_page(), 0);
$this->assertEqual(count($view->result), 11);
diff --git a/lib/Drupal/views/Tests/Plugin/StyleTest.php b/lib/Drupal/views/Tests/Plugin/StyleTest.php
index c4d64d5ca986..7144a4126280 100644
--- a/lib/Drupal/views/Tests/Plugin/StyleTest.php
+++ b/lib/Drupal/views/Tests/Plugin/StyleTest.php
@@ -41,13 +41,13 @@ function testGroupingLegacy() {
// Reduce the amount of items to make the test a bit easier.
// Set up the pager.
- $view->display['default']->handler->override_option('pager', array(
+ $view->display['default']->handler->overrideOption('pager', array(
'type' => 'some',
'options' => array('items_per_page' => 3),
));
// Add the job field .
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
@@ -140,13 +140,13 @@ function _testGrouping($stripped = FALSE) {
// Reduce the amount of items to make the test a bit easier.
// Set up the pager.
- $view->display['default']->handler->override_option('pager', array(
+ $view->display['default']->handler->overrideOption('pager', array(
'type' => 'some',
'options' => array('items_per_page' => 3),
));
// Add the job and age field.
- $view->display['default']->handler->override_option('fields', array(
+ $view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
diff --git a/lib/Drupal/views/Tests/ViewTestBase.php b/lib/Drupal/views/Tests/ViewTestBase.php
index 9ae90c705b72..a2f9b29fcd54 100644
--- a/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/lib/Drupal/views/Tests/ViewTestBase.php
@@ -390,7 +390,7 @@ protected function getBasicView() {
// Set up the fields we need.
$display = $view->new_display('default', 'Master', 'default');
- $display->override_option('fields', array(
+ $display->overrideOption('fields', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
@@ -412,7 +412,7 @@ protected function getBasicView() {
));
// Set up the sort order.
- $display->override_option('sorts', array(
+ $display->overrideOption('sorts', array(
'id' => array(
'order' => 'ASC',
'id' => 'id',
@@ -423,7 +423,7 @@ protected function getBasicView() {
));
// Set up the pager.
- $display->override_option('pager', array(
+ $display->overrideOption('pager', array(
'type' => 'none',
'options' => array('offset' => 0),
));
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index d92e8de16176..f2be380cbe04 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -421,7 +421,7 @@ public function getExposedInput() {
// default display. If they are, store them on this display. This way,
// multiple displays in the same view can share the same filters and
// remember settings.
- $display_id = ($this->display_handler->is_defaulted('filters')) ? 'default' : $this->current_display;
+ $display_id = ($this->display_handler->isDefaulted('filters')) ? 'default' : $this->current_display;
if (empty($this->exposed_input) && !empty($_SESSION['views'][$this->name][$display_id])) {
$this->exposed_input = $_SESSION['views'][$this->name][$display_id];
@@ -555,8 +555,8 @@ public function initStyle() {
}
if (!isset($this->plugin_name)) {
- $this->plugin_name = $this->display_handler->get_option('style_plugin');
- $this->style_options = $this->display_handler->get_option('style_options');
+ $this->plugin_name = $this->display_handler->getOption('style_plugin');
+ $this->style_options = $this->display_handler->getOption('style_options');
}
$this->style_plugin = views_get_plugin('style', $this->plugin_name);
@@ -593,7 +593,7 @@ public function fixMissingRelationships() {
// For each relationship we have, make sure we mark the base it provides as
// available.
- foreach ($this->display_handler->get_option('relationships') as $id => $options) {
+ foreach ($this->display_handler->getOption('relationships') as $id => $options) {
$options['table'] = views_move_table($options['table']);
$data = views_fetch_data($options['table'], FALSE);
if (isset($data[$options['field']]['relationship']['base'])) {
@@ -606,7 +606,7 @@ public function fixMissingRelationships() {
$types = View::viewsObjectTypes();
foreach ($types as $key => $info) {
- foreach ($this->display_handler->get_option($info['plural']) as $id => $options) {
+ foreach ($this->display_handler->getOption($info['plural']) as $id => $options) {
$options['table'] = views_move_table($options['table']);
$data = views_fetch_data($options['table'], FALSE);
@@ -644,14 +644,14 @@ public function fixMissingRelationships() {
$relationship = $this->add_item($this->current_display, 'relationship', $info['table'], $info['field'], $relationship_options);
}
foreach ($handlers as $handler) {
- $options = $this->display_handler->get_option($types[$handler['type']]['plural']);
+ $options = $this->display_handler->getOption($types[$handler['type']]['plural']);
if ($relationship) {
$options[$handler['id']]['relationship'] = $relationship;
}
else {
unset($options[$handler['id']]);
}
- $this->display_handler->set_option($types[$handler['type']]['plural'], $options);
+ $this->display_handler->setOption($types[$handler['type']]['plural'], $options);
}
}
}
@@ -678,7 +678,7 @@ public function initHandlers() {
*/
public function initPager() {
if (!isset($this->pager)) {
- $this->pager = $this->display_handler->get_plugin('pager');
+ $this->pager = $this->display_handler->getPlugin('pager');
if ($this->pager->use_pager()) {
$this->pager->set_current_page($this->current_page);
@@ -717,7 +717,7 @@ public function getBaseTables() {
'#global' => TRUE,
);
- foreach ($this->display_handler->get_handlers('relationship') as $handler) {
+ foreach ($this->display_handler->getHandlers('relationship') as $handler) {
$base_tables[$handler->definition['base']] = TRUE;
}
return $base_tables;
@@ -760,7 +760,7 @@ protected function _postExecute() {
*/
protected function _initHandler($key, $info) {
// Load the requested items from the display onto the object.
- $this->$key = $this->display_handler->get_handlers($key);
+ $this->$key = $this->display_handler->getHandlers($key);
// This reference deals with difficult PHP indirection.
$handlers = &$this->$key;
@@ -787,7 +787,7 @@ protected function _buildArguments() {
$position = -1;
// Create a title for use in the breadcrumb trail.
- $title = $this->display_handler->get_option('title');
+ $title = $this->display_handler->getOption('title');
$this->build_info['breadcrumb'] = array();
$breadcrumb_args = array();
@@ -831,7 +831,7 @@ protected function _buildArguments() {
}
else {
$arg_title = $argument->get_title();
- $argument->query($this->display_handler->use_group_by());
+ $argument->query($this->display_handler->useGroupBy());
}
// Add this argument's substitution
@@ -840,7 +840,7 @@ protected function _buildArguments() {
// Since we're really generating the breadcrumb for the item above us,
// check the default action of this argument.
- if ($this->display_handler->uses_breadcrumb() && $argument->uses_breadcrumb()) {
+ if ($this->display_handler->usesBreadcrumb() && $argument->uses_breadcrumb()) {
$path = $this->getUrl($breadcrumb_args);
if (strpos($path, '%') === FALSE) {
if (!empty($argument->options['breadcrumb_enable']) && !empty($argument->options['breadcrumb'])) {
@@ -904,7 +904,7 @@ public function initQuery() {
}
// Load the options.
- $query_options = $this->display_handler->get_option('query');
+ $query_options = $this->display_handler->getOption('query');
// Create and initialize the query object.
$plugin = !empty($views_data['table']['base']['query class']) ? $views_data['table']['base']['query class'] : 'views_query';
@@ -963,8 +963,8 @@ public function build($display_id = NULL) {
// Let the handlers interact with each other if they really want.
$this->_preQuery();
- if ($this->display_handler->uses_exposed()) {
- $exposed_form = $this->display_handler->get_plugin('exposed_form');
+ if ($this->display_handler->usesExposed()) {
+ $exposed_form = $this->display_handler->getPlugin('exposed_form');
$this->exposed_widgets = $exposed_form->render_exposed_form();
if (form_set_error() || !empty($this->build_info['abort'])) {
$this->built = TRUE;
@@ -979,7 +979,7 @@ public function build($display_id = NULL) {
// Set the filtering groups.
if (!empty($this->filter)) {
- $filter_groups = $this->display_handler->get_option('filter_groups');
+ $filter_groups = $this->display_handler->getOption('filter_groups');
if ($filter_groups) {
$this->query->set_group_operator($filter_groups['operator']);
foreach ($filter_groups['groups'] as $id => $operator) {
@@ -1028,10 +1028,10 @@ public function build($display_id = NULL) {
$this->_build('empty');
// Allow display handler to affect the query:
- $this->display_handler->query($this->display_handler->use_group_by());
+ $this->display_handler->query($this->display_handler->useGroupBy());
// Allow style handler to affect the query:
- $this->style_plugin->query($this->display_handler->use_group_by());
+ $this->style_plugin->query($this->display_handler->useGroupBy());
// Allow exposed form to affect the query:
if (isset($exposed_form)) {
@@ -1102,7 +1102,7 @@ public function _build($key) {
}
}
$handlers[$id]->set_relationship();
- $handlers[$id]->query($this->display_handler->use_group_by());
+ $handlers[$id]->query($this->display_handler->useGroupBy());
}
}
}
@@ -1130,7 +1130,7 @@ public function execute($display_id = NULL) {
}
// Don't allow to use deactivated displays, but display them on the live preview.
- if (!$this->display[$this->current_display]->handler->get_option('enabled') && empty($this->live_preview)) {
+ if (!$this->display[$this->current_display]->handler->getOption('enabled') && empty($this->live_preview)) {
$this->build_info['fail'] = TRUE;
return FALSE;
}
@@ -1146,7 +1146,7 @@ public function execute($display_id = NULL) {
$cache = FALSE;
}
else {
- $cache = $this->display_handler->get_plugin('cache');
+ $cache = $this->display_handler->getPlugin('cache');
}
if ($cache && $cache->cache_get('results')) {
if ($this->pager->use_pager()) {
@@ -1208,7 +1208,7 @@ public function render($display_id = NULL) {
$this->startQueryCapture();
}
- $exposed_form = $this->display_handler->get_plugin('exposed_form');
+ $exposed_form = $this->display_handler->getPlugin('exposed_form');
$exposed_form->pre_render($this->result);
// Check for already-cached output.
@@ -1216,7 +1216,7 @@ public function render($display_id = NULL) {
$cache = FALSE;
}
else {
- $cache = $this->display_handler->get_plugin('cache');
+ $cache = $this->display_handler->getPlugin('cache');
}
if ($cache && $cache->cache_get('output')) {
}
@@ -1398,7 +1398,7 @@ public function preExecute($args = array()) {
$this->dom_id = !empty($this->dom_id) ? $this->dom_id : md5($this->name . REQUEST_TIME . rand());
// Allow the display handler to set up for execution
- $this->display_handler->pre_execute();
+ $this->display_handler->preExecute();
}
/**
@@ -1431,7 +1431,7 @@ public function attachDisplays() {
// Give other displays an opportunity to attach to the view.
foreach ($this->display as $id => $display) {
if (!empty($this->display[$id]->handler)) {
- $this->display[$id]->handler->attach_to($this->current_display);
+ $this->display[$id]->handler->attachTo($this->current_display);
}
}
$this->is_attachment = FALSE;
@@ -1455,7 +1455,7 @@ public function executeHookMenu($display_id = NULL, &$callbacks = array()) {
// Execute the view
if (isset($this->display_handler)) {
- return $this->display_handler->execute_hook_menu($callbacks);
+ return $this->display_handler->executeHookMenu($callbacks);
}
}
@@ -1473,7 +1473,7 @@ public function executeHookBlockList($display_id = NULL) {
// Execute the view
if (isset($this->display_handler)) {
- return $this->display_handler->execute_hook_block_list();
+ return $this->display_handler->executeHookBlockList();
}
}
@@ -1548,7 +1548,7 @@ public function getTitle() {
$title = $this->build_info['title'];
}
else {
- $title = $this->display_handler->get_option('title');
+ $title = $this->display_handler->getOption('title');
}
// Allow substitutions from the first row.
@@ -1677,7 +1677,7 @@ public function getPath() {
return FALSE;
}
}
- return $this->display_handler->get_path();
+ return $this->display_handler->getPath();
}
/**
diff --git a/lib/Drupal/views/ViewStorage.php b/lib/Drupal/views/ViewStorage.php
index cf7aa533c08d..91d9cf213015 100644
--- a/lib/Drupal/views/ViewStorage.php
+++ b/lib/Drupal/views/ViewStorage.php
@@ -220,7 +220,7 @@ function add_item($display_id, $type, $table, $field, $options = array(), $id =
$types = View::viewsObjectTypes();
$this->setDisplay($display_id);
- $fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
+ $fields = $this->display[$display_id]->handler->getOption($types[$type]['plural']);
if (empty($id)) {
$id = $this->generate_item_id($field, $fields);
@@ -238,7 +238,7 @@ function add_item($display_id, $type, $table, $field, $options = array(), $id =
'field' => $field,
) + $options;
- $this->display[$display_id]->handler->set_option($types[$type]['plural'], $fields);
+ $this->display[$display_id]->handler->setOption($types[$type]['plural'], $fields);
return $id;
}
@@ -264,7 +264,7 @@ function get_items($type, $display_id = NULL) {
// Get info about the types so we can get the right data.
$types = View::viewsObjectTypes();
- return $this->display[$display_id]->handler->get_option($types[$type]['plural']);
+ return $this->display[$display_id]->handler->getOption($types[$type]['plural']);
}
/**
@@ -288,7 +288,7 @@ function get_item($display_id, $type, $id) {
$this->setDisplay($display_id);
// Get the existing configuration
- $fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
+ $fields = $this->display[$display_id]->handler->getOption($types[$type]['plural']);
return isset($fields[$id]) ? $fields[$id] : NULL;
}
@@ -314,7 +314,7 @@ function set_item($display_id, $type, $id, $item) {
$this->setDisplay($display_id);
// Get the existing configuration.
- $fields = $this->display[$display_id]->handler->get_option($types[$type]['plural']);
+ $fields = $this->display[$display_id]->handler->getOption($types[$type]['plural']);
if (isset($item)) {
$fields[$id] = $item;
}
@@ -323,7 +323,7 @@ function set_item($display_id, $type, $id, $item) {
}
// Store.
- $this->display[$display_id]->handler->set_option($types[$type]['plural'], $fields);
+ $this->display[$display_id]->handler->setOption($types[$type]['plural'], $fields);
}
/**
diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php
index 4b3a2cf16bbb..60fecec602f8 100644
--- a/lib/Views/field/Plugin/views/field/Field.php
+++ b/lib/Views/field/Plugin/views/field/Field.php
@@ -120,7 +120,7 @@ function get_base_table() {
// base table of the view is the base table of the current field.
// For example a field from a node author on a node view does have users as base table.
if (!empty($this->options['relationship']) && $this->options['relationship'] != 'none') {
- $relationships = $this->view->display_handler->get_option('relationships');
+ $relationships = $this->view->display_handler->getOption('relationships');
if (!empty($relationships[$this->options['relationship']])) {
$options = $relationships[$this->options['relationship']];
$data = views_fetch_data($options['table']);
diff --git a/lib/Views/search/Plugin/views/field/Score.php b/lib/Views/search/Plugin/views/field/Score.php
index 72c38d501f75..da3901abf4e7 100644
--- a/lib/Views/search/Plugin/views/field/Score.php
+++ b/lib/Views/search/Plugin/views/field/Score.php
@@ -32,9 +32,9 @@ function option_definition() {
}
function options_form(&$form, &$form_state) {
- $style_options = $this->view->display_handler->get_option('style_options');
+ $style_options = $this->view->display_handler->getOption('style_options');
if (isset($style_options['default']) && $style_options['default'] == $this->options['id']) {
- $handlers = $this->view->display_handler->get_handlers('field');
+ $handlers = $this->view->display_handler->getHandlers('field');
$options = array('' => t('No alternate'));
foreach ($handlers as $id => $handler) {
$options[$id] = $handler->ui_name();
diff --git a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
index 03534308bc9f..9e6985e56ec0 100644
--- a/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
+++ b/lib/Views/taxonomy/Plugin/views/filter/TaxonomyIndexTid.php
@@ -240,7 +240,7 @@ function accept_exposed_input($input) {
// If view is an attachment and is inheriting exposed filters, then assume
// exposed input has already been validated
- if (!empty($this->view->is_attachment) && $this->view->display_handler->uses_exposed()) {
+ if (!empty($this->view->is_attachment) && $this->view->display_handler->usesExposed()) {
$this->validated_exposed_input = (array) $this->view->exposed_raw_input[$this->options['expose']['identifier']];
}
diff --git a/modules/node.views.inc b/modules/node.views.inc
index d95b8100359c..6bdbba2a76de 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -646,7 +646,7 @@ function node_row_node_view_preprocess_node(&$vars) {
$options = $vars['view']->style_plugin->row_plugin->options;
// Prevent the comment form from showing up if this is not a page display.
- if ($vars['view_mode'] == 'full' && !$vars['view']->display_handler->has_path()) {
+ if ($vars['view_mode'] == 'full' && !$vars['view']->display_handler->hasPath()) {
$node->comment = FALSE;
}
@@ -681,9 +681,9 @@ function node_views_analyze($view) {
if (empty($display->handler)) {
continue;
}
- if (!$display->handler->is_defaulted('access') || !$display->handler->is_defaulted('filters')) {
+ if (!$display->handler->isDefaulted('access') || !$display->handler->isDefaulted('filters')) {
// check for no access control
- $access = $display->handler->get_option('access');
+ $access = $display->handler->getOption('access');
if (empty($access['type']) || $access['type'] == 'none') {
$select = db_select('role', 'r');
$select->innerJoin('role_permission', 'p', 'r.rid = p.rid');
@@ -700,7 +700,7 @@ function node_views_analyze($view) {
if (!($roles['anonymous']->safe && $roles['authenticated']->safe)) {
$ret[] = Analyzer::formatMessage(t('Some roles lack permission to access content, but display %display has no access control.', array('%display' => $display->display_title)), 'warning');
}
- $filters = $display->handler->get_option('filters');
+ $filters = $display->handler->getOption('filters');
foreach ($filters as $filter) {
if ($filter['table'] == 'node' && ($filter['field'] == 'status' || $filter['field'] == 'status_extra')) {
continue 2;
@@ -713,7 +713,7 @@ function node_views_analyze($view) {
}
foreach ($view->display as $id => $display) {
if ($display->display_plugin == 'page') {
- if ($display->handler->get_option('path') == 'node/%') {
+ if ($display->handler->getOption('path') == 'node/%') {
$ret[] = Analyzer::formatMessage(t('Display %display has set node/% as path. This will not produce what you want. If you want to have multiple versions of the node view, use panels.', array('%display' => $display->display_title)), 'warning');
}
}
diff --git a/theme/theme.inc b/theme/theme.inc
index 1a5eb0ba672a..a2ded44fc12b 100644
--- a/theme/theme.inc
+++ b/theme/theme.inc
@@ -61,7 +61,7 @@ function template_preprocess_views_view(&$vars) {
$vars['attributes']['class'][] = 'view-id-' . $vars['name'];
$vars['attributes']['class'][] = 'view-display-id-' . $vars['display_id'];
- $css_class = $view->display_handler->get_option('css_class');
+ $css_class = $view->display_handler->getOption('css_class');
if (!empty($css_class)) {
$vars['css_class'] = preg_replace('/[^a-zA-Z0-9- ]/', '-', $css_class);
$vars['attributes']['class'][] = $vars['css_class'];
@@ -69,14 +69,14 @@ function template_preprocess_views_view(&$vars) {
$empty = empty($vars['rows']);
- $vars['header'] = $view->display_handler->render_area('header', $empty);
- $vars['footer'] = $view->display_handler->render_area('footer', $empty);
+ $vars['header'] = $view->display_handler->renderArea('header', $empty);
+ $vars['footer'] = $view->display_handler->renderArea('footer', $empty);
if ($empty) {
- $vars['empty'] = $view->display_handler->render_area('empty', $empty);
+ $vars['empty'] = $view->display_handler->renderArea('empty', $empty);
}
$vars['exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : '';
- $vars['more'] = $view->display_handler->render_more_link();
+ $vars['more'] = $view->display_handler->renderMoreLink();
$vars['feed_icon'] = !empty($view->feed_icon) ? $view->feed_icon : '';
$vars['pager'] = '';
@@ -85,7 +85,7 @@ function template_preprocess_views_view(&$vars) {
// Render title for the admin preview.
$vars['title'] = !empty($view->views_ui_context) ? filter_xss_admin($view->getTitle()) : '';
- if ($view->display_handler->render_pager()) {
+ if ($view->display_handler->renderPager()) {
$exposed_input = isset($view->exposed_raw_input) ? $view->exposed_raw_input : NULL;
$vars['pager'] = $view->renderPager($exposed_input);
}
@@ -633,7 +633,7 @@ function template_preprocess_views_view_table(&$vars) {
$vars['attributes']['class'] = array('views-table');
if (empty($vars['rows']) && !empty($options['empty_table'])) {
- $vars['rows'][0][0] = $view->display_handler->render_area('empty');
+ $vars['rows'][0][0] = $view->display_handler->renderArea('empty');
// Calculate the amounts of rows with output.
$vars['field_attributes'][0][0]['colspan'] = count($vars['header']);
$vars['field_classes'][0][0] = 'views-empty';
@@ -852,7 +852,7 @@ function template_preprocess_views_view_rss(&$vars) {
// escaped source data (such as & becoming &amp;).
$vars['description'] = check_plain(decode_entities(strip_tags($style->get_description())));
- if ($view->display_handler->get_option('sitename_title')) {
+ if ($view->display_handler->getOption('sitename_title')) {
$title = $config->get('name');
if ($slogan = $config->get('slogan')) {
$title .= ' - ' . $slogan;
@@ -865,9 +865,9 @@ function template_preprocess_views_view_rss(&$vars) {
// Figure out which display which has a path we're using for this feed. If there isn't
// one, use the global $base_url
- $link_display_id = $view->display_handler->get_link_display();
+ $link_display_id = $view->display_handler->getLinkDisplay();
if ($link_display_id && !empty($view->display[$link_display_id])) {
- $path = $view->display[$link_display_id]->handler->get_path();
+ $path = $view->display[$link_display_id]->handler->getPath();
}
if ($path) {
diff --git a/views.module b/views.module
index bf1b1e53ad10..4f31fcc68c76 100644
--- a/views.module
+++ b/views.module
@@ -396,7 +396,7 @@ function views_preprocess_node(&$vars) {
// If a node is being rendered in a view, and the view does not have a path,
// prevent drupal from accidentally setting the $page variable:
- if ($vars['page'] && $vars['view_mode'] == 'full' && !$vars['view']->display_handler->has_path()) {
+ if ($vars['page'] && $vars['view_mode'] == 'full' && !$vars['view']->display_handler->hasPath()) {
$vars['page'] = FALSE;
}
}
@@ -700,14 +700,14 @@ function views_block_info() {
foreach ($view->display as $display_id => $display) {
if (isset($display->handler) && !empty($display->handler->definition['uses_hook_block'])) {
- $result = $display->handler->execute_hook_block_list();
+ $result = $display->handler->executeHookBlockList();
if (is_array($result)) {
$items = array_merge($items, $result);
}
}
- if (isset($display->handler) && $display->handler->get_option('exposed_block')) {
- $result = $display->handler->get_special_blocks();
+ if (isset($display->handler) && $display->handler->getOption('exposed_block')) {
+ $result = $display->handler->getSpecialBlocks();
if (is_array($result)) {
$items = array_merge($items, $result);
}
@@ -769,7 +769,7 @@ function views_block_view($delta) {
if ($view->access($display_id)) {
$view->setDisplay($display_id);
if (isset($view->display_handler)) {
- $output = $view->display_handler->view_special_blocks($type);
+ $output = $view->display_handler->viewSpecialBlocks($type);
// Before returning the block output, convert it to a renderable
// array with contextual links.
views_add_block_contextual_links($output, $view, $display_id, 'special_block_' . $type);
@@ -1546,7 +1546,7 @@ function views_get_applicable_views($type) {
// This view uses_hook_menu. Clone it so that different handlers
// don't trip over each other, and add it to the list.
$v = $view->cloneView();
- if ($v->setDisplay($id) && $v->display_handler->get_option('enabled')) {
+ if ($v->setDisplay($id) && $v->display_handler->getOption('enabled')) {
$result[] = array($v, $id);
}
// In PHP 4.4.7 and presumably earlier, if we do not unset $v
@@ -2049,7 +2049,7 @@ function views_exposed_form($form, &$form_state) {
'#id' => drupal_html_id('edit-submit-' . $view->name),
);
- $form['#action'] = url($view->display_handler->get_url());
+ $form['#action'] = url($view->display_handler->getUrl());
$form['#theme'] = views_theme_functions('views_exposed_form', $view, $display);
$form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->name) . '-' . check_plain($display->id));
// $form['#attributes']['class'] = array('views-exposed-form');
diff --git a/views_ui.module b/views_ui.module
index 823d8ff1ffc3..7c273258dd27 100644
--- a/views_ui.module
+++ b/views_ui.module
@@ -474,7 +474,7 @@ function theme_views_ui_view_preview_section($vars) {
*/
function views_ui_view_preview_section_handler_links($view, $type, $title = FALSE) {
$display = $view->display_handler->display;
- $handlers = $view->display_handler->get_handlers($type);
+ $handlers = $view->display_handler->getHandlers($type);
$links = array();
$types = View::viewsObjectTypes();
@@ -766,8 +766,8 @@ function _views_ui_get_paths($view) {
else {
$view->initDisplay(); // Make sure all the handlers are set up
foreach ($view->display as $display) {
- if (!empty($display->handler) && $display->handler->has_path()) {
- $one_path = $display->handler->get_option('path');
+ if (!empty($display->handler) && $display->handler->hasPath()) {
+ $one_path = $display->handler->getOption('path');
if (empty($path_sort)) {
$path_sort = strtolower($one_path);
}
--
GitLab