diff --git a/core/lib/Drupal/Core/Language/Language.php b/core/lib/Drupal/Core/Language/Language.php index 4db85da..68ef44e 100644 --- a/core/lib/Drupal/Core/Language/Language.php +++ b/core/lib/Drupal/Core/Language/Language.php @@ -58,8 +58,8 @@ public function __construct(array $options = array()) { * @todo Remove this function once $GLOBALS['language'] is gone. */ public function extend($obj) { - $vars = get_object_vars($obj); - foreach ($vars as $var => $value) { + $variables = get_object_vars($obj); + foreach ($variables as $var => $value) { $this->$var = $value; } } diff --git a/core/modules/color/color.module b/core/modules/color/color.module index 2203133..1308ef6 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -60,7 +60,7 @@ function color_form_system_theme_settings_alter(&$form, &$form_state) { * * @see theme() */ -function _color_html_alter(&$vars) { +function _color_html_alter(&$variables) { global $theme_key; $themes = list_themes(); @@ -77,12 +77,12 @@ function _color_html_alter(&$vars) { if (drupal_basename($old_path) == drupal_basename($color_path)) { // Replace the path to the new css file. // This keeps the order of the stylesheets intact. - $vars['css'][drupal_basename($old_path)]['data'] = $color_path; + $variables['css'][drupal_basename($old_path)]['data'] = $color_path; } } } - $vars['styles'] = drupal_get_css($vars['css']); + $variables['styles'] = drupal_get_css($variables['css']); } } @@ -95,13 +95,13 @@ function _color_html_alter(&$vars) { * * @see theme() */ -function _color_page_alter(&$vars) { +function _color_page_alter(&$variables) { global $theme_key; // Override logo. $logo = config('color.' . $theme_key)->get('logo'); - if ($logo && $vars['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $vars['logo'])) { - $vars['logo'] = file_create_url($logo); + if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.png$!', $variables['logo'])) { + $variables['logo'] = file_create_url($logo); } } diff --git a/core/modules/link/link.module b/core/modules/link/link.module index 57d744c..9eee27a 100644 --- a/core/modules/link/link.module +++ b/core/modules/link/link.module @@ -416,13 +416,13 @@ function link_theme() { /** * Formats a link as separate title and URL elements. */ -function theme_link_formatter_link_separate($vars) { +function theme_link_formatter_link_separate($variables) { $output = ''; $output .= '
'; - if (!empty($vars['title'])) { - $output .= '
' . check_plain($vars['title']) . '
'; + if (!empty($variables['title'])) { + $output .= '
' . check_plain($variables['title']) . '
'; } - $output .= '
' . l($vars['url_title'], $vars['href'], $vars['options']) . '
'; + $output .= '
' . l($variables['url_title'], $variables['href'], $variables['options']) . '
'; $output .= '
'; return $output; } diff --git a/core/modules/node/node.views.inc b/core/modules/node/node.views.inc index 7f19d43..03b13e3 100644 --- a/core/modules/node/node.views.inc +++ b/core/modules/node/node.views.inc @@ -614,21 +614,21 @@ function node_views_data() { /** * Implements hook_preprocess_node(). */ -function node_row_node_view_preprocess_node(&$vars) { - $node = $vars['node']; - $options = $vars['view']->rowPlugin->options; +function node_row_node_view_preprocess_node(&$variables) { + $node = $variables['node']; + $options = $variables['view']->rowPlugin->options; // Prevent the comment form from showing up if this is not a page display. - if ($vars['view_mode'] == 'full' && !$vars['view']->display_handler->hasPath()) { + if ($variables['view_mode'] == 'full' && !$variables['view']->display_handler->hasPath()) { $node->comment = FALSE; } if (!$options['links']) { - unset($vars['content']['links']); + unset($variables['content']['links']); } if (!empty($options['comments']) && user_access('access comments') && $node->comment) { - $vars['content']['comments'] = comment_node_page_additions($node); + $variables['content']['comments'] = comment_node_page_additions($node); } } diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 58a7f35..6e87795 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -235,25 +235,25 @@ function views_plugin_list() { * we haven't got a chance to load that file before Drupal builds the * node portion of the theme registry. */ -function views_preprocess_node(&$vars) { +function views_preprocess_node(&$variables) { // The 'view' attribute of the node is added in views_preprocess_node() - if (!empty($vars['node']->view) && $vars['node']->view->storage->id()) { - $vars['view'] = $vars['node']->view; - $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id(); - if (!empty($vars['node']->view->current_display)) { - $vars['theme_hook_suggestions'][] = 'node__view__' . $vars['node']->view->storage->id() . '__' . $vars['node']->view->current_display; + if (!empty($variables['node']->view) && $variables['node']->view->storage->id()) { + $variables['view'] = $variables['node']->view; + $variables['theme_hook_suggestions'][] = 'node__view__' . $variables['node']->view->storage->id(); + if (!empty($variables['node']->view->current_display)) { + $variables['theme_hook_suggestions'][] = 'node__view__' . $variables['node']->view->storage->id() . '__' . $variables['node']->view->current_display; // 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->hasPath()) { - $vars['page'] = FALSE; + if ($variables['page'] && $variables['view_mode'] == 'full' && !$variables['view']->display_handler->hasPath()) { + $variables['page'] = FALSE; } } } // Allow to alter comments and links based on the settings in the row plugin. - if (!empty($vars['view']->style_plugin->row_plugin) && get_class($vars['view']->style_plugin->row_plugin) == 'views_plugin_row_node_view') { - node_row_node_view_preprocess_node($vars); + if (!empty($variables['view']->style_plugin->row_plugin) && get_class($variables['view']->style_plugin->row_plugin) == 'views_plugin_row_node_view') { + node_row_node_view_preprocess_node($variables); } } @@ -261,13 +261,13 @@ function views_preprocess_node(&$vars) { * A theme preprocess function to automatically allow view-based node * templates if called from a view. */ -function views_preprocess_comment(&$vars) { +function views_preprocess_comment(&$variables) { // The 'view' attribute of the node is added in template_preprocess_views_view_row_comment() - if (!empty($vars['comment']->view) && $vars['comment']->view->storage->id()) { - $vars['view'] = &$vars['comment']->view; - $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id(); - if (!empty($vars['node']->view->current_display)) { - $vars['theme_hook_suggestions'][] = 'comment__view__' . $vars['comment']->view->storage->id() . '__' . $vars['comment']->view->current_display; + if (!empty($variables['comment']->view) && $variables['comment']->view->storage->id()) { + $variables['view'] = &$variables['comment']->view; + $variables['theme_hook_suggestions'][] = 'comment__view__' . $variables['comment']->view->storage->id(); + if (!empty($variables['node']->view->current_display)) { + $variables['theme_hook_suggestions'][] = 'comment__view__' . $variables['comment']->view->storage->id() . '__' . $variables['comment']->view->current_display; } } } diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 0bae0fc..6ebc3b7 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -42,67 +42,67 @@ function _views_theme_functions($hook, ViewExecutable $view, $display = NULL) { /** * Preprocess the primary theme implementation for a view. */ -function template_preprocess_views_view(&$vars) { +function template_preprocess_views_view(&$variables) { global $base_path; - $view = $vars['view']; + $view = $variables['view']; - $vars['rows'] = (!empty($view->result) || $view->style_plugin->even_empty()) ? $view->style_plugin->render($view->result) : ''; + $variables['rows'] = (!empty($view->result) || $view->style_plugin->even_empty()) ? $view->style_plugin->render($view->result) : ''; // Force a render array so CSS/JS can be added. - if (!is_array($vars['rows'])) { - $vars['rows'] = array('#markup' => $vars['rows']); + if (!is_array($variables['rows'])) { + $variables['rows'] = array('#markup' => $variables['rows']); } - $vars['css_name'] = drupal_clean_css_identifier($view->storage->id()); - $vars['id'] = $view->storage->id(); - $vars['display_id'] = $view->current_display; + $variables['css_name'] = drupal_clean_css_identifier($view->storage->id()); + $variables['id'] = $view->storage->id(); + $variables['display_id'] = $view->current_display; // Basic classes - $vars['css_class'] = ''; + $variables['css_class'] = ''; - $vars['attributes']['class'] = array(); - $vars['attributes']['class'][] = 'view'; - $vars['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($vars['id']); - $vars['attributes']['class'][] = 'view-id-' . $vars['id']; - $vars['attributes']['class'][] = 'view-display-id-' . $vars['display_id']; + $variables['attributes']['class'] = array(); + $variables['attributes']['class'][] = 'view'; + $variables['attributes']['class'][] = 'view-' . drupal_clean_css_identifier($variables['id']); + $variables['attributes']['class'][] = 'view-id-' . $variables['id']; + $variables['attributes']['class'][] = 'view-display-id-' . $variables['display_id']; $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']; + $variables['css_class'] = preg_replace('/[^a-zA-Z0-9- ]/', '-', $css_class); + $variables['attributes']['class'][] = $variables['css_class']; } $empty = empty($view->result); - $vars['header'] = $view->display_handler->renderArea('header', $empty); - $vars['footer'] = $view->display_handler->renderArea('footer', $empty); - $vars['empty'] = $empty ? $view->display_handler->renderArea('empty', $empty) : FALSE; + $variables['header'] = $view->display_handler->renderArea('header', $empty); + $variables['footer'] = $view->display_handler->renderArea('footer', $empty); + $variables['empty'] = $empty ? $view->display_handler->renderArea('empty', $empty) : FALSE; - $vars['exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : ''; - $vars['more'] = $view->display_handler->renderMoreLink(); - $vars['feed_icon'] = !empty($view->feed_icon) ? $view->feed_icon : ''; + $variables['exposed'] = !empty($view->exposed_widgets) ? $view->exposed_widgets : ''; + $variables['more'] = $view->display_handler->renderMoreLink(); + $variables['feed_icon'] = !empty($view->feed_icon) ? $view->feed_icon : ''; - $vars['pager'] = ''; + $variables['pager'] = ''; // @todo: Figure out whether this belongs into views_ui_preprocess_views_view. // Render title for the admin preview. - $vars['title'] = !empty($view->views_ui_context) ? filter_xss_admin($view->getTitle()) : ''; + $variables['title'] = !empty($view->views_ui_context) ? filter_xss_admin($view->getTitle()) : ''; if ($view->display_handler->renderPager()) { $exposed_input = isset($view->exposed_raw_input) ? $view->exposed_raw_input : NULL; - $vars['pager'] = $view->renderPager($exposed_input); + $variables['pager'] = $view->renderPager($exposed_input); } if (!empty($view->attachment_before)) { - $vars['attachment_before'] = $view->attachment_before; + $variables['attachment_before'] = $view->attachment_before; } else { - $vars['attachment_before'] = array(); + $variables['attachment_before'] = array(); } if (!empty($view->attachment_after)) { - $vars['attachment_after'] = $view->attachment_after; + $variables['attachment_after'] = $view->attachment_after; } else { - $vars['attachment_after'] = array(); + $variables['attachment_after'] = array(); } // Add contextual links to the view. We need to attach them to the dummy @@ -111,7 +111,7 @@ function template_preprocess_views_view(&$vars) { // purposes, it doesn't matter what we attach them to, since once they are // processed by contextual_preprocess() they will appear in the $title_suffix // variable (which we will then render in views-view.tpl.php). - views_add_contextual_links($vars['view_array'], 'view', $view, $view->current_display); + views_add_contextual_links($variables['view_array'], 'view', $view, $view->current_display); // Attachments are always updated with the outer view, never by themselves, // so they do not have dom ids. @@ -125,8 +125,8 @@ function template_preprocess_views_view(&$vars) { // we set up a hash with the current time, $dom_id, to issue a "unique" identifier for // each view. This identifier is written to both Drupal.settings and the DIV // wrapper. - $vars['dom_id'] = $view->dom_id; - $vars['attributes']['class'][] = 'view-dom-id-' . $vars['dom_id']; + $variables['dom_id'] = $view->dom_id; + $variables['attributes']['class'][] = 'view-dom-id-' . $variables['dom_id']; } // If using AJAX, send identifying data about this view. @@ -135,13 +135,13 @@ function template_preprocess_views_view(&$vars) { 'views' => array( 'ajax_path' => url('views/ajax'), 'ajaxViews' => array( - 'views_dom_id:' . $vars['dom_id'] => array( + 'views_dom_id:' . $variables['dom_id'] => array( 'view_name' => $view->storage->id(), 'view_display_id' => $view->current_display, 'view_args' => check_plain(implode('/', $view->args)), 'view_path' => check_plain(current_path()), 'view_base_path' => $view->getPath(), - 'view_dom_id' => $vars['dom_id'], + 'view_dom_id' => $variables['dom_id'], // To fit multiple views on a page, the programmer may have // overridden the display's pager_element. 'pager_element' => isset($view->pager) ? $view->pager->get_pager_id() : 0, @@ -156,43 +156,43 @@ function template_preprocess_views_view(&$vars) { // If form fields were found in the View, reformat the View output as a form. if (views_view_has_form_elements($view)) { // Copy the rows so as not to modify them by reference when rendering. - $rows = $vars['rows']; + $rows = $variables['rows']; $rows = drupal_render($rows); - $output = !empty($rows) ? $rows : $vars['empty']; + $output = !empty($rows) ? $rows : $variables['empty']; $form = drupal_get_form(views_form_id($view), $view, $output); // The form is requesting that all non-essential views elements be hidden, // usually because the rendered step is not a view result. if ($form['show_view_elements']['#value'] == FALSE) { - $vars['header'] = ''; - $vars['exposed'] = ''; - $vars['pager'] = ''; - $vars['footer'] = ''; - $vars['more'] = ''; - $vars['feed_icon'] = ''; + $variables['header'] = ''; + $variables['exposed'] = ''; + $variables['pager'] = ''; + $variables['footer'] = ''; + $variables['more'] = ''; + $variables['feed_icon'] = ''; } - $vars['rows'] = $form; + $variables['rows'] = $form; } } /** * Preprocess theme function to print a single record from a row, with fields */ -function template_preprocess_views_view_fields(&$vars) { - $view = $vars['view']; +function template_preprocess_views_view_fields(&$variables) { + $view = $variables['view']; // Loop through the fields for this view. $previous_inline = FALSE; - $vars['fields'] = array(); // ensure it's at least an empty array. + $variables['fields'] = array(); // ensure it's at least an empty array. foreach ($view->field as $id => $field) { // render this even if set to exclude so it can be used elsewhere. $field_output = $view->style_plugin->get_field($view->row_index, $id); $empty = $field->is_value_empty($field_output, $field->options['empty_zero']); - if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($vars['options']['hide_empty'])))) { + if (empty($field->options['exclude']) && (!$empty || (empty($field->options['hide_empty']) && empty($variables['options']['hide_empty'])))) { $object = new stdClass(); $object->handler = &$view->field[$id]; - $object->inline = !empty($vars['options']['inline'][$id]); + $object->inline = !empty($variables['options']['inline'][$id]); - $object->element_type = $object->handler->element_type(TRUE, !$vars['options']['default_field_elements'], $object->inline); + $object->element_type = $object->handler->element_type(TRUE, !$variables['options']['default_field_elements'], $object->inline); if ($object->element_type) { $attributes = array(); if ($object->handler->options['element_default_classes']) { @@ -216,22 +216,22 @@ function template_preprocess_views_view_fields(&$vars) { } $object->content = $field_output; - if (isset($view->field[$id]->field_alias) && isset($vars['row']->{$view->field[$id]->field_alias})) { - $object->raw = $vars['row']->{$view->field[$id]->field_alias}; + if (isset($view->field[$id]->field_alias) && isset($variables['row']->{$view->field[$id]->field_alias})) { + $object->raw = $variables['row']->{$view->field[$id]->field_alias}; } else { $object->raw = NULL; // make sure it exists to reduce NOTICE } - if (!empty($vars['options']['separator']) && $previous_inline && $object->inline && $object->content) { - $object->separator = filter_xss_admin($vars['options']['separator']); + if (!empty($variables['options']['separator']) && $previous_inline && $object->inline && $object->content) { + $object->separator = filter_xss_admin($variables['options']['separator']); } $object->class = drupal_clean_css_identifier($id); $previous_inline = $object->inline; $object->inline_html = $object->handler->element_wrapper_type(TRUE, TRUE); - if ($object->inline_html === '' && $vars['options']['default_field_elements']) { + if ($object->inline_html === '' && $variables['options']['default_field_elements']) { $object->inline_html = $object->inline ? 'span' : 'div'; } @@ -267,7 +267,7 @@ function template_preprocess_views_view_fields(&$vars) { $object->label_html .= ': '; } - $object->element_label_type = $object->handler->element_label_type(TRUE, !$vars['options']['default_field_elements']); + $object->element_label_type = $object->handler->element_label_type(TRUE, !$variables['options']['default_field_elements']); if ($object->element_label_type) { $attributes = array(); if ($object->handler->options['element_default_classes']) { @@ -289,7 +289,7 @@ function template_preprocess_views_view_fields(&$vars) { } } - $vars['fields'][$id] = $object; + $variables['fields'][$id] = $object; } } @@ -298,10 +298,10 @@ function template_preprocess_views_view_fields(&$vars) { /** * Display a single views grouping. */ -function theme_views_view_grouping($vars) { - $view = $vars['view']; - $title = $vars['title']; - $content = $vars['content']; +function theme_views_view_grouping($variables) { + $view = $variables['view']; + $title = $variables['title']; + $content = $variables['content']; $output = '
'; $output .= '
' . $title . '
'; @@ -314,8 +314,8 @@ function theme_views_view_grouping($vars) { /** * Process a single grouping within a view. */ -function template_preprocess_views_view_grouping(&$vars) { - $vars['content'] = $vars['view']->style_plugin->render_grouping_sets($vars['rows'], $vars['grouping_level']); +function template_preprocess_views_view_grouping(&$variables) { + $variables['content'] = $variables['view']->style_plugin->render_grouping_sets($variables['rows'], $variables['grouping_level']); } /** @@ -325,11 +325,11 @@ function template_preprocess_views_view_grouping(&$vars) { * $field->field_alias says what the raw value in $row will be. Reach it like * this: @code { $row->{$field->field_alias} @endcode */ -function theme_views_view_field($vars) { - $view = $vars['view']; - $field = $vars['field']; - $row = $vars['row']; - return $vars['output']; +function theme_views_view_field($variables) { + $view = $variables['view']; + $field = $variables['field']; + $row = $variables['row']; + return $variables['output']; } /** @@ -339,17 +339,17 @@ function theme_views_view_field($vars) { * default, for performance. However, by creating a template, this * preprocess should get picked up. */ -function template_preprocess_views_view_field(&$vars) { - $vars['output'] = $vars['field']->advanced_render($vars['row']); +function template_preprocess_views_view_field(&$variables) { + $variables['output'] = $variables['field']->advanced_render($variables['row']); } /** * Preprocess theme function to print a single record from a row, with fields */ -function template_preprocess_views_view_summary(&$vars) { - $view = $vars['view']; +function template_preprocess_views_view_summary(&$variables) { + $view = $variables['view']; $argument = $view->argument[$view->build_info['summary_level']]; - $vars['row_classes'] = array(); + $variables['row_classes'] = array(); $url_options = array(); @@ -366,14 +366,14 @@ function template_preprocess_views_view_summary(&$vars) { // This is not done per single argument value, because this could cause performance problems. $row_args = array(); - foreach ($vars['rows'] as $id => $row) { + foreach ($variables['rows'] as $id => $row) { $row_args[$id] = $argument->summary_argument($row); } $argument->process_summary_arguments($row_args); - foreach ($vars['rows'] as $id => $row) { + foreach ($variables['rows'] as $id => $row) { - $vars['rows'][$id]->link = $argument->summary_name($row); + $variables['rows'][$id]->link = $argument->summary_name($row); $args = $view->args; $args[$argument->position] = $row_args[$id]; @@ -381,14 +381,14 @@ function template_preprocess_views_view_summary(&$vars) { if (!empty($argument->options['summary_options']['base_path'])) { $base_path = $argument->options['summary_options']['base_path']; } - $vars['rows'][$id]->url = url($view->getUrl($args, $base_path), $url_options); - $vars['rows'][$id]->count = intval($row->{$argument->count_alias}); + $variables['rows'][$id]->url = url($view->getUrl($args, $base_path), $url_options); + $variables['rows'][$id]->count = intval($row->{$argument->count_alias}); - $vars['row_classes'][$id] = array(); - if (isset($active_urls[$vars['rows'][$id]->url])) { - $vars['row_classes'][$id]['class'][] = 'active'; + $variables['row_classes'][$id] = array(); + if (isset($active_urls[$variables['rows'][$id]->url])) { + $variables['row_classes'][$id]['class'][] = 'active'; } - $vars['row_classes'][$id] = new Attribute($vars['row_classes'][$id]); + $variables['row_classes'][$id] = new Attribute($variables['row_classes'][$id]); } } @@ -396,10 +396,10 @@ function template_preprocess_views_view_summary(&$vars) { * Template preprocess theme function to print summary basically * unformatted. */ -function template_preprocess_views_view_summary_unformatted(&$vars) { - $view = $vars['view']; +function template_preprocess_views_view_summary_unformatted(&$variables) { + $view = $variables['view']; $argument = $view->argument[$view->build_info['summary_level']]; - $vars['row_classes'] = array(); + $variables['row_classes'] = array(); $url_options = array(); @@ -416,17 +416,17 @@ function template_preprocess_views_view_summary_unformatted(&$vars) { // Collect all arguments foreach row, to be able to alter them for example by the validator. // This is not done per single argument value, because this could cause performance problems. $row_args = array(); - foreach ($vars['rows'] as $id => $row) { + foreach ($variables['rows'] as $id => $row) { $row_args[$id] = $argument->summary_argument($row); } $argument->process_summary_arguments($row_args); - foreach ($vars['rows'] as $id => $row) { + foreach ($variables['rows'] as $id => $row) { // only false on first time: if ($count++) { - $vars['rows'][$id]->separator = filter_xss_admin($vars['options']['separator']); + $variables['rows'][$id]->separator = filter_xss_admin($variables['options']['separator']); } - $vars['rows'][$id]->link = $argument->summary_name($row); + $variables['rows'][$id]->link = $argument->summary_name($row); $args = $view->args; $args[$argument->position] = $row_args[$id]; @@ -434,31 +434,31 @@ function template_preprocess_views_view_summary_unformatted(&$vars) { if (!empty($argument->options['summary_options']['base_path'])) { $base_path = $argument->options['summary_options']['base_path']; } - $vars['rows'][$id]->url = url($view->getUrl($args, $base_path), $url_options); - $vars['rows'][$id]->count = intval($row->{$argument->count_alias}); - $vars['row_classes'][$id] = array(); - if (isset($active_urls[$vars['rows'][$id]->url])) { - $vars['row_classes'][$id]['class'][] = 'active'; + $variables['rows'][$id]->url = url($view->getUrl($args, $base_path), $url_options); + $variables['rows'][$id]->count = intval($row->{$argument->count_alias}); + $variables['row_classes'][$id] = array(); + if (isset($active_urls[$variables['rows'][$id]->url])) { + $variables['row_classes'][$id]['class'][] = 'active'; } - $vars['row_classes'][$id] = new Attribute($vars['row_classes'][$id]); + $variables['row_classes'][$id] = new Attribute($variables['row_classes'][$id]); } } /** * Display a view as a table style. */ -function template_preprocess_views_view_table(&$vars) { - $view = $vars['view']; +function template_preprocess_views_view_table(&$variables) { + $view = $variables['view']; - // We need the raw data for this grouping, which is passed in as $vars['rows']. + // We need the raw data for this grouping, which is passed in as $variables['rows']. // However, the template also needs to use for the rendered fields. We - // therefore swap the raw data out to a new variable and reset $vars['rows'] + // therefore swap the raw data out to a new variable and reset $variables['rows'] // so that it can get rebuilt. // Store rows so that they may be used by further preprocess functions. - $result = $vars['result'] = $vars['rows']; - $vars['rows'] = array(); - $vars['field_classes'] = array(); - $vars['header'] = array(); + $result = $variables['result'] = $variables['rows']; + $variables['rows'] = array(); + $variables['field_classes'] = array(); + $variables['header'] = array(); $options = $view->style_plugin->options; $handler = $view->style_plugin; @@ -483,16 +483,16 @@ function template_preprocess_views_view_table(&$vars) { foreach ($columns as $field => $column) { // Create a second variable so we can easily find what fields we have and what the // CSS classes should be. - $vars['fields'][$field] = drupal_clean_css_identifier($field); + $variables['fields'][$field] = drupal_clean_css_identifier($field); if ($active == $field) { - $vars['fields'][$field] .= ' active'; + $variables['fields'][$field] .= ' active'; } // render the header labels if ($field == $column && empty($fields[$field]->options['exclude'])) { $label = check_plain(!empty($fields[$field]) ? $fields[$field]->label() : ''); if (empty($options['info'][$field]['sortable']) || !$fields[$field]->click_sortable()) { - $vars['header'][$field] = $label; + $variables['header'][$field] = $label; } else { $initial = !empty($options['info'][$field]['default_sort_order']) ? $options['info'][$field]['default_sort_order'] : 'asc'; @@ -513,35 +513,35 @@ function template_preprocess_views_view_table(&$vars) { 'attributes' => array('title' => $title), 'query' => $query, ); - $vars['header'][$field] = l($label, current_path(), $link_options); + $variables['header'][$field] = l($label, current_path(), $link_options); } // Set up the header label class. - $vars['header_classes'][$field] = array(); + $variables['header_classes'][$field] = array(); if ($fields[$field]->options['element_default_classes']) { - $vars['header_classes'][$field]['class'][] = 'views-field'; - $vars['header_classes'][$field]['class'][] = 'views-field-' . $vars['fields'][$field]; + $variables['header_classes'][$field]['class'][] = 'views-field'; + $variables['header_classes'][$field]['class'][] = 'views-field-' . $variables['fields'][$field]; } - $vars['header_classes'][$field] = new Attribute($vars['header_classes'][$field]); + $variables['header_classes'][$field] = new Attribute($variables['header_classes'][$field]); $class = $fields[$field]->element_label_classes(0); if ($class) { - $vars['header_classes'][$field]['class'][] = $class; + $variables['header_classes'][$field]['class'][] = $class; } // Add responsive header classes. if (!empty($options['info'][$field]['responsive'])) { - $vars['header_classes'][$field]['class'][] = $options['info'][$field]['responsive']; + $variables['header_classes'][$field]['class'][] = $options['info'][$field]['responsive']; $responsive = TRUE; } // Add a CSS align class to each field if one was set if (!empty($options['info'][$field]['align'])) { - $vars['header_classes'][$field]['class'][] = drupal_clean_css_identifier($options['info'][$field]['align']); + $variables['header_classes'][$field]['class'][] = drupal_clean_css_identifier($options['info'][$field]['align']); } // Add a header label wrapper if one was selected. - if ($vars['header'][$field]) { + if ($variables['header'][$field]) { $element_label_type = $fields[$field]->element_label_type(TRUE, TRUE); if ($element_label_type) { - $vars['header'][$field] = '<' . $element_label_type . '>' . $vars['header'][$field] . ''; + $variables['header'][$field] = '<' . $element_label_type . '>' . $variables['header'][$field] . ''; } } @@ -549,25 +549,25 @@ function template_preprocess_views_view_table(&$vars) { // Add a CSS align class to each field if one was set if (!empty($options['info'][$field]['align'])) { - $vars['fields'][$field] .= ' ' . drupal_clean_css_identifier($options['info'][$field]['align']); + $variables['fields'][$field] .= ' ' . drupal_clean_css_identifier($options['info'][$field]['align']); } // Render each field into its appropriate column. foreach ($result as $num => $row) { // Add field classes - $vars['field_classes'][$field][$num] = array(); + $variables['field_classes'][$field][$num] = array(); if ($fields[$field]->options['element_default_classes']) { - $vars['field_classes'][$field][$num]['class'][] = 'views-field'; - $vars['field_classes'][$field][$num]['class'][] = 'views-field-' . $vars['fields'][$field]; + $variables['field_classes'][$field][$num]['class'][] = 'views-field'; + $variables['field_classes'][$field][$num]['class'][] = 'views-field-' . $variables['fields'][$field]; } - $vars['field_classes'][$field][$num] = new Attribute($vars['field_classes'][$field][$num]); + $variables['field_classes'][$field][$num] = new Attribute($variables['field_classes'][$field][$num]); if ($classes = $fields[$field]->element_classes($num)) { - $vars['field_classes'][$field][$num]['class'][] = $classes; + $variables['field_classes'][$field][$num]['class'][] = $classes; } // Add responsive header classes. if (!empty($options['info'][$field]['responsive'])) { - $vars['field_classes'][$field][$num]['class'][] = $options['info'][$field]['responsive']; + $variables['field_classes'][$field][$num]['class'][] = $options['info'][$field]['responsive']; } if (!empty($fields[$field]) && empty($fields[$field]->options['exclude'])) { @@ -578,97 +578,97 @@ function template_preprocess_views_view_table(&$vars) { } // Don't bother with separators and stuff if the field does not show up. - if (empty($field_output) && !empty($vars['rows'][$num][$column])) { + if (empty($field_output) && !empty($variables['rows'][$num][$column])) { continue; } // Place the field into the column, along with an optional separator. - if (!empty($vars['rows'][$num][$column])) { + if (!empty($variables['rows'][$num][$column])) { if (!empty($options['info'][$column]['separator'])) { - $vars['rows'][$num][$column] .= filter_xss_admin($options['info'][$column]['separator']); + $variables['rows'][$num][$column] .= filter_xss_admin($options['info'][$column]['separator']); } } else { - $vars['rows'][$num][$column] = ''; + $variables['rows'][$num][$column] = ''; } - $vars['rows'][$num][$column] .= $field_output; + $variables['rows'][$num][$column] .= $field_output; } } // Remove columns if the option is hide empty column is checked and the field is not empty. if (!empty($options['info'][$field]['empty_column'])) { $empty = TRUE; - foreach ($vars['rows'] as $num => $columns) { + foreach ($variables['rows'] as $num => $columns) { $empty &= empty($columns[$column]); } if ($empty) { - foreach ($vars['rows'] as $num => &$column_items) { + foreach ($variables['rows'] as $num => &$column_items) { unset($column_items[$column]); - unset($vars['header'][$column]); + unset($variables['header'][$column]); } } } } // Hide table header if all labels are empty. - if (!array_filter($vars['header'])) { - $vars['header'] = array(); + if (!array_filter($variables['header'])) { + $variables['header'] = array(); } $count = 0; - foreach ($vars['rows'] as $num => $row) { - $vars['row_classes'][$num] = array(); + foreach ($variables['rows'] as $num => $row) { + $variables['row_classes'][$num] = array(); if ($row_class_special) { - $vars['row_classes'][$num]['class'][] = ($count++ % 2 == 0) ? 'odd' : 'even'; + $variables['row_classes'][$num]['class'][] = ($count++ % 2 == 0) ? 'odd' : 'even'; if ($num === 0) { - $vars['row_classes'][$num]['class'][] = 'views-row-first'; + $variables['row_classes'][$num]['class'][] = 'views-row-first'; } - elseif ($num === (count($vars['rows']) - 1)) { - $vars['row_classes'][$num]['class'][] = 'views-row-last'; + elseif ($num === (count($variables['rows']) - 1)) { + $variables['row_classes'][$num]['class'][] = 'views-row-last'; } } if ($row_class = $handler->get_row_class($num)) { - $vars['row_classes'][$num]['class'][] = $row_class; + $variables['row_classes'][$num]['class'][] = $row_class; } - $vars['row_classes'][$num] = new Attribute($vars['row_classes'][$num]); + $variables['row_classes'][$num] = new Attribute($variables['row_classes'][$num]); } - $vars['attributes']['class'][] = 'views-table'; - if (empty($vars['rows']) && !empty($options['empty_table'])) { - $vars['rows'][0][0] = $view->display_handler->renderArea('empty'); + $variables['attributes']['class'][] = 'views-table'; + if (empty($variables['rows']) && !empty($options['empty_table'])) { + $variables['rows'][0][0] = $view->display_handler->renderArea('empty'); // Calculate the amounts of rows with output. - $vars['field_classes'][0][0] = new Attribute(array( - 'colspan' => count($vars['header']), + $variables['field_classes'][0][0] = new Attribute(array( + 'colspan' => count($variables['header']), 'class' => 'views-empty', )); } if (!empty($options['sticky'])) { - $vars['view']->element['#attached']['library'][] = array('system', 'drupal.tableheader'); - $vars['attributes']['class'][] = "sticky-enabled"; + $variables['view']->element['#attached']['library'][] = array('system', 'drupal.tableheader'); + $variables['attributes']['class'][] = "sticky-enabled"; } - $vars['attributes']['class'][] = 'cols-' . count($vars['header']); + $variables['attributes']['class'][] = 'cols-' . count($variables['header']); if (!empty($handler->options['summary'])) { - $vars['attributes_array'] = array('summary' => $handler->options['summary']); + $variables['attributes_array'] = array('summary' => $handler->options['summary']); } // If the table has headers and it should react responsively to columns hidden // with the classes represented by the constants RESPONSIVE_PRIORITY_MEDIUM // and RESPONSIVE_PRIORITY_LOW, add the tableresponsive behaviors. - if (count($vars['header']) && $responsive) { - $vars['view']->element['#attached']['library'][] = array('system', 'drupal.tableresponsive'); + if (count($variables['header']) && $responsive) { + $variables['view']->element['#attached']['library'][] = array('system', 'drupal.tableresponsive'); // Add 'responsive-enabled' class to the table to identify it for JS. // This is needed to target tables constructed by this function. - $vars['attributes']['class'][] = 'responsive-enabled'; + $variables['attributes']['class'][] = 'responsive-enabled'; } } /** * Display a view as a grid style. */ -function template_preprocess_views_view_grid(&$vars) { - $view = $vars['view']; +function template_preprocess_views_view_grid(&$variables) { + $view = $variables['view']; $result = $view->result; $options = $view->style_plugin->options; $handler = $view->style_plugin; @@ -676,7 +676,7 @@ function template_preprocess_views_view_grid(&$vars) { $row_class_special = isset($options['row_class_special']) ? $options['row_class_special'] : TRUE; $columns = $options['columns']; - $vars['attributes']['class'][] = 'views-view-grid cols-' . $columns; + $variables['attributes']['class'][] = 'views-view-grid cols-' . $columns; $rows = array(); $row_indexes = array(); @@ -686,7 +686,7 @@ function template_preprocess_views_view_grid(&$vars) { $col_count = 0; $row_count = 0; $count = 0; - foreach ($vars['rows'] as $row_index => $item) { + foreach ($variables['rows'] as $row_index => $item) { $count++; $row[] = $item; $row_indexes[$row_count][$col_count] = $row_index; @@ -709,12 +709,12 @@ function template_preprocess_views_view_grid(&$vars) { } } else { - $num_rows = floor(count($vars['rows']) / $columns); + $num_rows = floor(count($variables['rows']) / $columns); // The remainders are the 'odd' columns that are slightly longer. - $remainders = count($vars['rows']) % $columns; + $remainders = count($variables['rows']) % $columns; $row = 0; $col = 0; - foreach ($vars['rows'] as $count => $item) { + foreach ($variables['rows'] as $count => $item) { $rows[$row][$col] = $item; $row_indexes[$row][$col] = $count; $row++; @@ -754,84 +754,84 @@ function template_preprocess_views_view_grid(&$vars) { $row_classes = new Attribute($row_classes); foreach ($rows[$row_number] as $column_number => $item) { - $vars['column_classes'][$row_number][$column_number] = array(); + $variables['column_classes'][$row_number][$column_number] = array(); if ($default_row_class) { - $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-' . ($column_number + 1); + $variables['column_classes'][$row_number][$column_number]['class'][] = 'col-' . ($column_number + 1); } if ($row_class_special) { if ($column_number == 0) { - $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-first'; + $variables['column_classes'][$row_number][$column_number]['class'][] = 'col-first'; } elseif (count($rows[$row_number]) == ($column_number + 1)) { - $vars['column_classes'][$row_number][$column_number]['class'][] = 'col-last'; + $variables['column_classes'][$row_number][$column_number]['class'][] = 'col-last'; } } if (isset($row_indexes[$row_number][$column_number]) && $column_class = $view->style_plugin->get_row_class($row_indexes[$row_number][$column_number])) { - $vars['column_classes'][$row_number][$column_number]['class'][] = $column_class; + $variables['column_classes'][$row_number][$column_number]['class'][] = $column_class; } - $vars['column_classes'][$row_number][$column_number] = new Attribute($vars['column_classes'][$row_number][$column_number]); + $variables['column_classes'][$row_number][$column_number] = new Attribute($variables['column_classes'][$row_number][$column_number]); } } - $vars['rows'] = $rows; + $variables['rows'] = $rows; if (!empty($handler->options['summary'])) { - $vars['attributes_array'] = array('summary' => $handler->options['summary']); + $variables['attributes_array'] = array('summary' => $handler->options['summary']); } // If the table has headers and it should react responsively to columns hidden // with the classes represented by the constants RESPONSIVE_PRIORITY_MEDIUM // and RESPONSIVE_PRIORITY_LOW, add the tableresponsive behaviors. - if (count($vars['header']) && $responsive) { - $vars['view']->element['#attached']['library'][] = array('system', 'drupal.tableresponsive'); + if (count($variables['header']) && $responsive) { + $variables['view']->element['#attached']['library'][] = array('system', 'drupal.tableresponsive'); // Add 'responsive-enabled' class to the table to identify it for JS. // This is needed to target tables constructed by this function. - $vars['attributes']['class'][] = 'responsive-enabled'; + $variables['attributes']['class'][] = 'responsive-enabled'; } } /** * Display the simple view of rows one after another */ -function template_preprocess_views_view_unformatted(&$vars) { - $view = $vars['view']; - $rows = $vars['rows']; +function template_preprocess_views_view_unformatted(&$variables) { + $view = $variables['view']; + $rows = $variables['rows']; $style = $view->style_plugin; $options = $style->options; - $vars['row_classes'] = array(); - $vars['classes'] = array(); + $variables['row_classes'] = array(); + $variables['classes'] = array(); $default_row_class = isset($options['default_row_class']) ? $options['default_row_class'] : FALSE; $row_class_special = isset($options['row_class_special']) ? $options['row_class_special'] : FALSE; // Set up striping values. $count = 0; $max = count($rows); foreach ($rows as $id => $row) { - $vars['row_classes'][$id] = array(); + $variables['row_classes'][$id] = array(); $count++; if ($default_row_class) { - $vars['row_classes'][$id]['class'][] = 'views-row'; - $vars['row_classes'][$id]['class'][] = 'views-row-' . $count; + $variables['row_classes'][$id]['class'][] = 'views-row'; + $variables['row_classes'][$id]['class'][] = 'views-row-' . $count; } if ($row_class_special) { - $vars['row_classes'][$id]['class'][] = 'views-row-' . ($count % 2 ? 'odd' : 'even'); + $variables['row_classes'][$id]['class'][] = 'views-row-' . ($count % 2 ? 'odd' : 'even'); if ($count == 1) { - $vars['row_classes'][$id]['class'][] = 'views-row-first'; + $variables['row_classes'][$id]['class'][] = 'views-row-first'; } if ($count == $max) { - $vars['row_classes'][$id]['class'][] = 'views-row-last'; + $variables['row_classes'][$id]['class'][] = 'views-row-last'; } } if ($row_class = $view->style_plugin->get_row_class($id)) { - $vars['row_classes'][$id]['class'][] = $row_class; + $variables['row_classes'][$id]['class'][] = $row_class; } - $vars['row_classes'][$id] = new Attribute($vars['row_classes'][$id]); + $variables['row_classes'][$id] = new Attribute($variables['row_classes'][$id]); } } /** * Display the view as an HTML list element */ -function template_preprocess_views_view_list(&$vars) { - $handler = $vars['view']->style_plugin; +function template_preprocess_views_view_list(&$variables) { + $handler = $variables['view']->style_plugin; // Fetch classes from handler options. $class = explode(' ', $handler->options['class']); @@ -847,25 +847,25 @@ function template_preprocess_views_view_list(&$vars) { // Initialize a new attribute class for $wrapper_class. if ($wrapper_class) { $wrapper_class = new Attribute(array('class' => $wrapper_class)); - $vars['wrapper_prefix'] = ''; - $vars['wrapper_suffix'] = '
'; + $variables['wrapper_prefix'] = ''; + $variables['wrapper_suffix'] = ''; } - $vars['list_type_prefix'] = '<' . $handler->options['type'] . $attributes . '>'; - $vars['list_type_suffix'] = 'options['type'] . '>'; + $variables['list_type_prefix'] = '<' . $handler->options['type'] . $attributes . '>'; + $variables['list_type_suffix'] = 'options['type'] . '>'; - template_preprocess_views_view_unformatted($vars); + template_preprocess_views_view_unformatted($variables); } /** * Preprocess an RSS feed */ -function template_preprocess_views_view_rss(&$vars) { +function template_preprocess_views_view_rss(&$variables) { global $base_url; - $view = &$vars['view']; - $options = &$vars['options']; - $items = &$vars['rows']; + $view = &$variables['view']; + $options = &$variables['options']; + $items = &$variables['rows']; $style = &$view->style_plugin; @@ -874,7 +874,7 @@ function template_preprocess_views_view_rss(&$vars) { // The RSS 2.0 "spec" doesn't indicate HTML can be used in the description. // We strip all HTML tags, but need to prevent double encoding from properly // escaped source data (such as & becoming &amp;). - $vars['description'] = check_plain(decode_entities(strip_tags($style->get_description()))); + $variables['description'] = check_plain(decode_entities(strip_tags($style->get_description()))); if ($view->display_handler->getOption('sitename_title')) { $title = $config->get('name'); @@ -885,7 +885,7 @@ function template_preprocess_views_view_rss(&$vars) { else { $title = $view->getTitle(); } - $vars['title'] = check_plain($title); + $variables['title'] = check_plain($title); // Figure out which display which has a path we're using for this feed. If there isn't // one, use the global $base_url @@ -906,49 +906,49 @@ function template_preprocess_views_view_rss(&$vars) { $path = ''; } - $vars['link'] = check_url(url($path, $url_options)); + $variables['link'] = check_url(url($path, $url_options)); } - $vars['langcode'] = check_plain(language(LANGUAGE_TYPE_INTERFACE)->langcode); - $vars['namespaces'] = new Attribute($style->namespaces); - $vars['items'] = $items; - $vars['channel_elements'] = format_xml_elements($style->channel_elements); + $variables['langcode'] = check_plain(language(LANGUAGE_TYPE_INTERFACE)->langcode); + $variables['namespaces'] = new Attribute($style->namespaces); + $variables['items'] = $items; + $variables['channel_elements'] = format_xml_elements($style->channel_elements); // During live preview we don't want to output the header since the contents // of the feed are being displayed inside a normal HTML page. - if (empty($vars['view']->live_preview)) { - $vars['view']->getResponse()->headers->set('Content-Type', 'application/rss+xml; charset=utf-8'); + if (empty($variables['view']->live_preview)) { + $variables['view']->getResponse()->headers->set('Content-Type', 'application/rss+xml; charset=utf-8'); } } /** * Default theme function for all RSS rows. */ -function template_preprocess_views_view_row_rss(&$vars) { - $view = &$vars['view']; - $options = &$vars['options']; - $item = &$vars['row']; - - $vars['title'] = check_plain($item->title); - $vars['link'] = check_url($item->link); - $vars['description'] = check_plain($item->description); - $vars['item_elements'] = empty($item->elements) ? '' : format_xml_elements($item->elements); +function template_preprocess_views_view_row_rss(&$variables) { + $view = &$variables['view']; + $options = &$variables['options']; + $item = &$variables['row']; + + $variables['title'] = check_plain($item->title); + $variables['link'] = check_url($item->link); + $variables['description'] = check_plain($item->description); + $variables['item_elements'] = empty($item->elements) ? '' : format_xml_elements($item->elements); } /** * Default theme function for all filter forms. */ -function template_preprocess_views_exposed_form(&$vars) { - $form = &$vars['form']; +function template_preprocess_views_exposed_form(&$variables) { + $form = &$variables['form']; // Put all single checkboxes together in the last spot. $checkboxes = ''; if (!empty($form['q'])) { - $vars['q'] = drupal_render($form['q']); + $variables['q'] = drupal_render($form['q']); } - $vars['widgets'] = array(); + $variables['widgets'] = array(); foreach ($form['#info'] as $id => $info) { // Set aside checkboxes. if (isset($form[$info['value']]['#type']) && $form[$info['value']]['#type'] == 'checkbox') { @@ -974,7 +974,7 @@ function template_preprocess_views_exposed_form(&$vars) { $widget->description = check_plain($info['description']); } - $vars['widgets'][$id] = $widget; + $variables['widgets'][$id] = $widget; } // Wrap up all the checkboxes we set aside into a widget. @@ -984,24 +984,24 @@ function template_preprocess_views_exposed_form(&$vars) { $widget->label = $widget->operator = $widget->widget = NULL; $widget->id = 'checkboxes'; $widget->widget = $checkboxes; - $vars['widgets']['checkboxes'] = $widget; + $variables['widgets']['checkboxes'] = $widget; } if (isset($form['sort_by'])) { - $vars['sort_by'] = drupal_render($form['sort_by']); - $vars['sort_order'] = drupal_render($form['sort_order']); + $variables['sort_by'] = drupal_render($form['sort_by']); + $variables['sort_order'] = drupal_render($form['sort_order']); } if (isset($form['items_per_page'])) { - $vars['items_per_page'] = drupal_render($form['items_per_page']); + $variables['items_per_page'] = drupal_render($form['items_per_page']); } if (isset($form['offset'])) { - $vars['offset'] = drupal_render($form['offset']); + $variables['offset'] = drupal_render($form['offset']); } if (isset($form['reset'])) { - $vars['reset_button'] = drupal_render($form['reset']); + $variables['reset_button'] = drupal_render($form['reset']); } // This includes the submit button. - $vars['button'] = drupal_render_children($form); + $variables['button'] = drupal_render_children($form); } /** @@ -1036,12 +1036,12 @@ function theme_views_form_views_form($variables) { return drupal_render_children($form); } -function theme_views_mini_pager($vars) { +function theme_views_mini_pager($variables) { global $pager_page_array, $pager_total; - $tags = $vars['tags']; - $element = $vars['element']; - $parameters = $vars['parameters']; + $tags = $variables['tags']; + $element = $variables['element']; + $parameters = $variables['parameters']; // Current is the page we are currently paged to. $pager_current = $pager_page_array[$element] + 1; diff --git a/core/modules/views/views_ui/views_ui.module b/core/modules/views/views_ui/views_ui.module index 8434656..3e306e4 100644 --- a/core/modules/views/views_ui/views_ui.module +++ b/core/modules/views/views_ui/views_ui.module @@ -244,21 +244,21 @@ function views_ui_cache_set(ViewUI $view) { /** * Theme preprocess for views-view.tpl.php. */ -function views_ui_preprocess_views_view(&$vars) { - $view = $vars['view']; +function views_ui_preprocess_views_view(&$variables) { + $view = $variables['view']; if (!empty($view->live_preview) && Drupal::moduleHandler()->moduleExists('contextual')) { $view->hide_admin_links = TRUE; foreach (array('title', 'header', 'exposed', 'rows', 'pager', 'more', 'footer', 'empty', 'attachment_after', 'attachment_before') as $section) { - if (!empty($vars[$section])) { - $vars[$section] = array( + if (!empty($variables[$section])) { + $variables[$section] = array( '#theme' => 'views_ui_view_preview_section', '#view' => $view, '#section' => $section, - '#content' => is_array($vars[$section]) ? drupal_render($vars[$section]) : $vars[$section], + '#content' => is_array($variables[$section]) ? drupal_render($variables[$section]) : $variables[$section], '#theme_wrappers' => array('views_ui_container'), '#attributes' => array('class' => 'contextual-region'), ); - $vars[$section] = drupal_render($vars[$section]); + $variables[$section] = drupal_render($variables[$section]); } } } diff --git a/core/modules/views/views_ui/views_ui.theme.inc b/core/modules/views/views_ui/views_ui.theme.inc index 2f92bdd..d1a010f 100644 --- a/core/modules/views/views_ui/views_ui.theme.inc +++ b/core/modules/views/views_ui/views_ui.theme.inc @@ -187,8 +187,8 @@ function theme_views_ui_build_group_filter_form($variables) { /** * Turn the reorder form into a proper table */ -function theme_views_ui_reorder_displays_form($vars) { - $form = $vars['form']; +function theme_views_ui_reorder_displays_form($variables) { + $form = $variables['form']; $rows = array(); foreach (element_children($form) as $key) { if (isset($form[$key]['#display'])) { @@ -277,8 +277,8 @@ function theme_views_ui_rearrange_form($variables) { /** * Turn the rearrange form into a proper table */ -function theme_views_ui_rearrange_filter_form(&$vars) { - $form = $vars['form']; +function theme_views_ui_rearrange_filter_form(&$variables) { + $form = $variables['form']; $rows = $ungroupable_rows = array(); // Enable grouping only if > 1 group. $grouping = count(array_keys($form['#group_options'])) > 1; @@ -449,49 +449,49 @@ function theme_views_ui_style_plugin_table($variables) { /** * Theme preprocess for theme_views_ui_view_preview_section(). */ -function template_preprocess_views_ui_view_preview_section(&$vars) { - switch ($vars['section']) { +function template_preprocess_views_ui_view_preview_section(&$variables) { + switch ($variables['section']) { case 'title': - $vars['title'] = t('Title'); - $links = views_ui_view_preview_section_display_category_links($vars['view'], 'title', $vars['title']); + $variables['title'] = t('Title'); + $links = views_ui_view_preview_section_display_category_links($variables['view'], 'title', $variables['title']); break; case 'header': - $vars['title'] = t('Header'); - $links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']); + $variables['title'] = t('Header'); + $links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']); break; case 'empty': - $vars['title'] = t('No results behavior'); - $links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']); + $variables['title'] = t('No results behavior'); + $links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']); break; case 'exposed': // @todo Sorts can be exposed too, so we may need a better title. - $vars['title'] = t('Exposed Filters'); - $links = views_ui_view_preview_section_display_category_links($vars['view'], 'exposed_form_options', $vars['title']); + $variables['title'] = t('Exposed Filters'); + $links = views_ui_view_preview_section_display_category_links($variables['view'], 'exposed_form_options', $variables['title']); break; case 'rows': // @todo The title needs to depend on what is being viewed. - $vars['title'] = t('Content'); - $links = views_ui_view_preview_section_rows_links($vars['view']); + $variables['title'] = t('Content'); + $links = views_ui_view_preview_section_rows_links($variables['view']); break; case 'pager': - $vars['title'] = t('Pager'); - $links = views_ui_view_preview_section_display_category_links($vars['view'], 'pager_options', $vars['title']); + $variables['title'] = t('Pager'); + $links = views_ui_view_preview_section_display_category_links($variables['view'], 'pager_options', $variables['title']); break; case 'more': - $vars['title'] = t('More'); - $links = views_ui_view_preview_section_display_category_links($vars['view'], 'use_more', $vars['title']); + $variables['title'] = t('More'); + $links = views_ui_view_preview_section_display_category_links($variables['view'], 'use_more', $variables['title']); break; case 'footer': - $vars['title'] = t('Footer'); - $links = views_ui_view_preview_section_handler_links($vars['view'], $vars['section']); + $variables['title'] = t('Footer'); + $links = views_ui_view_preview_section_handler_links($variables['view'], $variables['section']); break; case 'attachment_before': // @todo: Add links to the attachment configuration page. - $vars['title'] = t('Attachment before'); + $variables['title'] = t('Attachment before'); break; case 'attachment_after': // @todo: Add links to the attachment configuration page. - $vars['title'] = t('Attachment after'); + $variables['title'] = t('Attachment after'); break; } @@ -506,16 +506,16 @@ function template_preprocess_views_ui_view_preview_section(&$vars) { 'library' => array(array('contextual', 'drupal.contextual-links')), ), ); - $vars['links'] = drupal_render($build); + $variables['links'] = drupal_render($build); } - $vars['theme_hook_suggestions'][] = 'views_ui_view_preview_section__' . $vars['section']; + $variables['theme_hook_suggestions'][] = 'views_ui_view_preview_section__' . $variables['section']; } /** * Returns the HTML for a section of a View being previewed within the Views UI. */ -function theme_views_ui_view_preview_section($vars) { - return '

' . $vars['title'] . '

' - . $vars['links'] - . '
'. $vars['content'] . '
'; +function theme_views_ui_view_preview_section($variables) { + return '

' . $variables['title'] . '

' + . $variables['links'] + . '
'. $variables['content'] . '
'; } diff --git a/core/themes/seven/template.php b/core/themes/seven/template.php index fa7124c..e2157c5 100644 --- a/core/themes/seven/template.php +++ b/core/themes/seven/template.php @@ -8,19 +8,19 @@ /** * Implements hook_preprocess_HOOK() for maintenance-page.tpl.php. */ -function seven_preprocess_maintenance_page(&$vars) { +function seven_preprocess_maintenance_page(&$variables) { // While markup for normal pages is split into page.tpl.php and html.tpl.php, // the markup for the maintenance page is all in the single // maintenance-page.tpl.php template. So, to have what's done in // seven_preprocess_html() also happen on the maintenance page, it has to be // called here. - seven_preprocess_html($vars); + seven_preprocess_html($variables); } /** * Implements hook_preprocess_HOOK() for html.tpl.php. */ -function seven_preprocess_html(&$vars) { +function seven_preprocess_html(&$variables) { drupal_add_library('system', 'normalize'); // Add conditional CSS for IE8 and below. drupal_add_css(path_to_theme() . '/ie.css', array('group' => CSS_AGGREGATE_THEME, 'browsers' => array('IE' => 'lte IE 8', '!IE' => FALSE), 'weight' => 999, 'preprocess' => FALSE)); @@ -29,12 +29,12 @@ function seven_preprocess_html(&$vars) { /** * Implements hook_preprocess_HOOK() for page.tpl.php. */ -function seven_preprocess_page(&$vars) { - $vars['primary_local_tasks'] = $vars['tabs']; - unset($vars['primary_local_tasks']['#secondary']); - $vars['secondary_local_tasks'] = array( +function seven_preprocess_page(&$variables) { + $variables['primary_local_tasks'] = $variables['tabs']; + unset($variables['primary_local_tasks']['#secondary']); + $variables['secondary_local_tasks'] = array( '#theme' => 'menu_local_tasks', - '#secondary' => isset($vars['tabs']['#secondary']) ? $vars['tabs']['#secondary'] : '', + '#secondary' => isset($variables['tabs']['#secondary']) ? $variables['tabs']['#secondary'] : '', ); } diff --git a/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php b/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php index 00d2310..a944a80 100644 --- a/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php +++ b/core/vendor/guzzle/parser/Guzzle/Parser/UriTemplate/UriTemplate.php @@ -82,20 +82,20 @@ private function parseExpression($expression) $values = explode(',', $expression); foreach ($values as &$value) { $value = trim($value); - $varspec = array(); + $variablespec = array(); $substrPos = strpos($value, ':'); if ($substrPos) { - $varspec['value'] = substr($value, 0, $substrPos); - $varspec['modifier'] = ':'; - $varspec['position'] = (int) substr($value, $substrPos + 1); + $variablespec['value'] = substr($value, 0, $substrPos); + $variablespec['modifier'] = ':'; + $variablespec['position'] = (int) substr($value, $substrPos + 1); } elseif (substr($value, -1) == '*') { - $varspec['modifier'] = '*'; - $varspec['value'] = substr($value, 0, -1); + $variablespec['modifier'] = '*'; + $variablespec['value'] = substr($value, 0, -1); } else { - $varspec['value'] = (string) $value; - $varspec['modifier'] = ''; + $variablespec['value'] = (string) $value; + $variablespec['modifier'] = ''; } - $value = $varspec; + $value = $variablespec; } return array( diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php index 8a9afe8..c4d2e91 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/AssetCollection.php @@ -29,7 +29,7 @@ class AssetCollection implements \IteratorAggregate, AssetCollectionInterface private $targetPath; private $content; private $clones; - private $vars; + private $variables; private $values; /** @@ -39,7 +39,7 @@ class AssetCollection implements \IteratorAggregate, AssetCollectionInterface * @param array $filters Filters for the current collection * @param string $sourceRoot The root directory */ - public function __construct($assets = array(), $filters = array(), $sourceRoot = null, array $vars = array()) + public function __construct($assets = array(), $filters = array(), $sourceRoot = null, array $variables = array()) { $this->assets = array(); foreach ($assets as $asset) { @@ -49,7 +49,7 @@ public function __construct($assets = array(), $filters = array(), $sourceRoot = $this->filters = new FilterCollection($filters); $this->sourceRoot = $sourceRoot; $this->clones = new \SplObjectStorage(); - $this->vars = $vars; + $this->vars = $variables; $this->values = array(); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php index 1ce93ae..cdf618b 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/BaseAsset.php @@ -30,7 +30,7 @@ private $targetPath; private $content; private $loaded; - private $vars; + private $variables; private $values; /** @@ -38,12 +38,12 @@ * * @param array $filters Filters for the asset */ - public function __construct($filters = array(), $sourceRoot = null, $sourcePath = null, array $vars = array()) + public function __construct($filters = array(), $sourceRoot = null, $sourcePath = null, array $variables = array()) { $this->filters = new FilterCollection($filters); $this->sourceRoot = $sourceRoot; $this->sourcePath = $sourcePath; - $this->vars = $vars; + $this->vars = $variables; $this->values = array(); $this->loaded = false; } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php index 0933ade..5ebbbe9 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/FileAsset.php @@ -33,7 +33,7 @@ class FileAsset extends BaseAsset * * @throws \InvalidArgumentException If the supplied root doesn't match the source when guessing the path */ - public function __construct($source, $filters = array(), $sourceRoot = null, $sourcePath = null, array $vars = array()) + public function __construct($source, $filters = array(), $sourceRoot = null, $sourcePath = null, array $variables = array()) { if (null === $sourceRoot) { $sourceRoot = dirname($source); @@ -50,7 +50,7 @@ public function __construct($source, $filters = array(), $sourceRoot = null, $so $this->source = $source; - parent::__construct($filters, $sourceRoot, $sourcePath, $vars); + parent::__construct($filters, $sourceRoot, $sourcePath, $variables); } public function load(FilterInterface $additionalFilter = null) diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php index 4f8559c..a9c3f7e 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/GlobAsset.php @@ -32,12 +32,12 @@ class GlobAsset extends AssetCollection * @param array $filters An array of filters * @param string $root The root directory */ - public function __construct($globs, $filters = array(), $root = null, array $vars = array()) + public function __construct($globs, $filters = array(), $root = null, array $variables = array()) { $this->globs = (array) $globs; $this->initialized = false; - parent::__construct(array(), $filters, $root, $vars); + parent::__construct(array(), $filters, $root, $variables); } public function all() diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php index d1dcfe0..1af5ec4 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Asset/HttpAsset.php @@ -33,7 +33,7 @@ class HttpAsset extends BaseAsset * * @throws \InvalidArgumentException If the first argument is not an URL */ - public function __construct($sourceUrl, $filters = array(), $ignoreErrors = false, array $vars = array()) + public function __construct($sourceUrl, $filters = array(), $ignoreErrors = false, array $variables = array()) { if (0 === strpos($sourceUrl, '//')) { $sourceUrl = 'http:'.$sourceUrl; @@ -47,7 +47,7 @@ public function __construct($sourceUrl, $filters = array(), $ignoreErrors = fals list($scheme, $url) = explode('://', $sourceUrl, 2); list($host, $path) = explode('/', $url, 2); - parent::__construct($filters, $scheme.'://'.$host, $path, $vars); + parent::__construct($filters, $scheme.'://'.$host, $path, $variables); } public function load(FilterInterface $additionalFilter = null) diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php index b1a90ad..a165d68 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/AssetWriter.php @@ -63,16 +63,16 @@ public function writeAsset(AssetInterface $asset) } } - private function getCombinations(array $vars) + private function getCombinations(array $variables) { - if (!$vars) { + if (!$variables) { return array(array()); } $combinations = array(); $nbValues = array(); foreach ($this->varValues as $var => $values) { - if (!in_array($var, $vars, true)) { + if (!in_array($var, $variables, true)) { continue; } @@ -83,7 +83,7 @@ private function getCombinations(array $vars) $k = $i; $combination = array(); - foreach ($vars as $var) { + foreach ($variables as $var) { $combination[$var] = $this->varValues[$var][$k % $nbValues[$var]]; $k = intval($k/$nbValues[$var]); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php index 8209dfa..bc91143 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Extension/Twig/AsseticNode.php @@ -101,10 +101,10 @@ protected function compileDebug(\Twig_Compiler $compiler) protected function compileAsset(\Twig_Compiler $compiler, AssetInterface $asset, $name) { - if ($vars = $asset->getVars()) { + if ($variables = $asset->getVars()) { $compiler->write("// check variable conditions\n"); - foreach ($vars as $var) { + foreach ($variables as $var) { $compiler ->write("if (!isset(\$context['assetic']['vars']['$var'])) {\n") ->indent() @@ -134,7 +134,7 @@ protected function compileAsset(\Twig_Compiler $compiler, AssetInterface $asset, protected function compileAssetUrl(\Twig_Compiler $compiler, AssetInterface $asset, $name) { - if (!$vars = $asset->getVars()) { + if (!$variables = $asset->getVars()) { $compiler->repr($asset->getTargetPath()); return; @@ -147,7 +147,7 @@ protected function compileAssetUrl(\Twig_Compiler $compiler, AssetInterface $ass ; $first = true; - foreach ($vars as $var) { + foreach ($variables as $var) { if (!$first) { $compiler->raw(", "); } diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php index c4393c0..9f966a7 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Factory/AssetFactory.php @@ -307,19 +307,19 @@ protected function createAssetReference($name) return new AssetReference($this->am, $name); } - protected function createHttpAsset($sourceUrl, $vars) + protected function createHttpAsset($sourceUrl, $variables) { - return new HttpAsset($sourceUrl, array(), false, $vars); + return new HttpAsset($sourceUrl, array(), false, $variables); } - protected function createGlobAsset($glob, $root = null, $vars) + protected function createGlobAsset($glob, $root = null, $variables) { - return new GlobAsset($glob, array(), $root, $vars); + return new GlobAsset($glob, array(), $root, $variables); } - protected function createFileAsset($source, $root = null, $path = null, $vars) + protected function createFileAsset($source, $root = null, $path = null, $variables) { - return new FileAsset($source, array(), $root, $path, $vars); + return new FileAsset($source, array(), $root, $path, $variables); } protected function getFilter($name) diff --git a/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php b/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php index 8fda83b..91d1f44 100644 --- a/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php +++ b/core/vendor/kriswallsmith/assetic/src/Assetic/Util/PathUtils.php @@ -9,10 +9,10 @@ */ abstract class PathUtils { - public static function resolvePath($path, array $vars, array $values) + public static function resolvePath($path, array $variables, array $values) { $map = array(); - foreach ($vars as $var) { + foreach ($variables as $var) { if (false === strpos($path, '{'.$var.'}')) { continue; } diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php index 3995ee1..88019ad 100644 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php +++ b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/Asset/AssetCollectionTest.php @@ -168,10 +168,10 @@ public function testGetLastModified($timestamps, $expected) public function testGetLastModifiedWithValues() { - $vars = array('locale'); - $asset = new FileAsset(__DIR__.'/../Fixture/messages.{locale}.js', array(), null, null, $vars); + $variables = array('locale'); + $asset = new FileAsset(__DIR__.'/../Fixture/messages.{locale}.js', array(), null, null, $variables); - $coll = new AssetCollection(array($asset), array(), null, $vars); + $coll = new AssetCollection(array($asset), array(), null, $variables); $coll->setValues(array('locale' => 'en')); try { $coll->getLastModified(); diff --git a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php index 97cf2c1..9c81dad 100644 --- a/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php +++ b/core/vendor/kriswallsmith/assetic/tests/Assetic/Test/AssetWriterTest.php @@ -133,12 +133,12 @@ public function testAssetWithInputVars() /** * @dataProvider getCombinationTests */ - public function testGetCombinations($vars, $expectedCombinations) + public function testGetCombinations($variables, $expectedCombinations) { $ref = new \ReflectionMethod($this->writer, 'getCombinations'); $ref->setAccessible(true); - $this->assertEquals($expectedCombinations, $ref->invoke($this->writer, $vars)); + $this->assertEquals($expectedCombinations, $ref->invoke($this->writer, $variables)); } public function getCombinationTests() diff --git a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php index dc17ffb..f84ebff 100644 --- a/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php +++ b/core/vendor/symfony/routing/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php @@ -296,17 +296,17 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren // optimize parameters array if ($matches || $hostMatches) { - $vars = array(); + $variables = array(); if ($hostMatches) { - $vars[] = '$hostMatches'; + $variables[] = '$hostMatches'; } if ($matches) { - $vars[] = '$matches'; + $variables[] = '$matches'; } - $vars[] = "array('_route' => '$name')"; + $variables[] = "array('_route' => '$name')"; $code .= sprintf(" return \$this->mergeDefaults(array_replace(%s), %s);\n" - , implode(', ', $vars), str_replace("\n", '', var_export($route->getDefaults(), true))); + , implode(', ', $variables), str_replace("\n", '', var_export($route->getDefaults(), true))); } elseif ($route->getDefaults()) { $code .= sprintf(" return %s;\n", str_replace("\n", '', var_export(array_replace($route->getDefaults(), array('_route' => $name)), true))); diff --git a/core/vendor/twig/twig/lib/Twig/Extension/Debug.php b/core/vendor/twig/twig/lib/Twig/Extension/Debug.php index 97007fb..b5e88c9 100644 --- a/core/vendor/twig/twig/lib/Twig/Extension/Debug.php +++ b/core/vendor/twig/twig/lib/Twig/Extension/Debug.php @@ -52,14 +52,14 @@ function twig_var_dump(Twig_Environment $env, $context) $count = func_num_args(); if (2 === $count) { - $vars = array(); + $variables = array(); foreach ($context as $key => $value) { if (!$value instanceof Twig_Template) { - $vars[$key] = $value; + $variables[$key] = $value; } } - var_dump($vars); + var_dump($variables); } else { for ($i = 2; $i < $count; $i++) { var_dump(func_get_arg($i)); diff --git a/core/vendor/twig/twig/lib/Twig/Parser.php b/core/vendor/twig/twig/lib/Twig/Parser.php index 1179913..8161441 100644 --- a/core/vendor/twig/twig/lib/Twig/Parser.php +++ b/core/vendor/twig/twig/lib/Twig/Parser.php @@ -68,9 +68,9 @@ public function getFilename() public function parse(Twig_TokenStream $stream, $test = null, $dropNeedle = false) { // push all variables into the stack to keep the current state of the parser - $vars = get_object_vars($this); - unset($vars['stack'], $vars['env'], $vars['handlers'], $vars['visitors'], $vars['expressionParser']); - $this->stack[] = $vars; + $variables = get_object_vars($this); + unset($variables['stack'], $variables['env'], $variables['handlers'], $variables['visitors'], $variables['expressionParser']); + $this->stack[] = $variables; // tag handlers if (null === $this->handlers) { diff --git a/core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php b/core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php index 3b7da6e..91c0556 100644 --- a/core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php +++ b/core/vendor/twig/twig/test/Twig/Tests/Node/IncludeTest.php @@ -23,9 +23,9 @@ public function testConstructor() $this->assertEquals($expr, $node->getNode('expr')); $this->assertFalse($node->getAttribute('only')); - $vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 1), new Twig_Node_Expression_Constant(true, 1)), 1); - $node = new Twig_Node_Include($expr, $vars, true, false, 1); - $this->assertEquals($vars, $node->getNode('variables')); + $variables = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 1), new Twig_Node_Expression_Constant(true, 1)), 1); + $node = new Twig_Node_Include($expr, $variables, true, false, 1); + $this->assertEquals($variables, $node->getNode('variables')); $this->assertTrue($node->getAttribute('only')); } @@ -65,22 +65,22 @@ public function getTests() ); $expr = new Twig_Node_Expression_Constant('foo.twig', 1); - $vars = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 1), new Twig_Node_Expression_Constant(true, 1)), 1); - $node = new Twig_Node_Include($expr, $vars, false, false, 1); + $variables = new Twig_Node_Expression_Array(array(new Twig_Node_Expression_Constant('foo', 1), new Twig_Node_Expression_Constant(true, 1)), 1); + $node = new Twig_Node_Include($expr, $variables, false, false, 1); $tests[] = array($node, <<env->loadTemplate("foo.twig")->display(array_merge(\$context, array("foo" => true))); EOF ); - $node = new Twig_Node_Include($expr, $vars, true, false, 1); + $node = new Twig_Node_Include($expr, $variables, true, false, 1); $tests[] = array($node, <<env->loadTemplate("foo.twig")->display(array("foo" => true)); EOF ); - $node = new Twig_Node_Include($expr, $vars, true, true, 1); + $node = new Twig_Node_Include($expr, $variables, true, true, 1); $tests[] = array($node, <<