Commit fe8740a1 authored by merlinofchaos's avatar merlinofchaos

#563564 by dereine: Unformatted style does not use options, so the options icon should not appear.

parent e1d25621
......@@ -41,6 +41,8 @@ Views 2.x-dev
o #554000 by killes: Preview checking wrong flag for preview state causes feeds to display incorrectly when embedded.
o #554016 by webchick: views_embed_view() should check view access.
o #523222 by gpk: Contact link should not be allowed for the anonymous user.
o #563540 by dereine: Fix description of cache plugin settings.
o #563564 by dereine: Unformatted style does not use options, so the options icon should not appear.
Other changes:
o Implement a post_render hook (for themes too) and cache method.
......@@ -61,6 +63,7 @@ Views 2.x-dev
o #337741 by joachim: Allow profile fields to have "link to user" option.
o #534680 by dagmar: Visual indicator if checkbox will expand options.
o #512650 by sdboyer: Multiple many to one arguments on the same relationship were not relationship safe.
o #536994 by dboulet: Store result in variables for use in unformatted style.
Views 2.6
Bugs fixed:
......
......@@ -95,7 +95,6 @@ function views_views_plugins() {
'handler' => 'views_plugin_style_default',
'theme' => 'views_view_unformatted',
'uses row plugin' => TRUE,
'uses options' => TRUE,
'uses grouping' => TRUE,
'type' => 'normal',
'help topic' => 'style-unformatted',
......
......@@ -935,7 +935,7 @@ class views_plugin_display extends views_plugin {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
'#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
'#value' => t('You may also adjust the !settings for the currently selected access restriction by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
);
}
......@@ -977,7 +977,7 @@ class views_plugin_display extends views_plugin {
$form['markup'] = array(
'#prefix' => '<div class="form-item description">',
'#suffix' => '</div>',
'#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
'#value' => t('You may also adjust the !settings for the currently selected cache mechanism by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
);
}
break;
......
......@@ -281,7 +281,8 @@ function template_preprocess_views_view_table(&$vars) {
// 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']
// so that it can get rebuilt.
$result = $vars['rows'];
// Store rows so that they may be used by further preprocess functions.
$result = $vars['result'] = $vars['rows'];
$vars['rows'] = array();
$options = $view->style_plugin->options;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment