summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc12
1 files changed, 8 insertions, 4 deletions
diff --git a/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc b/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc
index 77f2100..cd7fe37 100644
--- a/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc
+++ b/kolab.org/www/drupal-7.15/sites/all/modules/views/plugins/views_plugin_display_page.inc
@@ -1,4 +1,5 @@
<?php
+
/**
* @file
* Contains the page display plugin.
@@ -217,6 +218,10 @@ class views_plugin_display_page extends views_plugin_display {
return drupal_not_found();
}
+ if (!empty($this->view->build_info['denied'])) {
+ return drupal_access_denied();
+ }
+
$this->view->get_breadcrumb(TRUE);
@@ -371,7 +376,6 @@ class views_plugin_display_page extends views_plugin_display {
);
}
$form['menu']['weight'] = array(
- '#suffix' => '</div>',
'#title' => t('Weight'),
'#type' => 'textfield',
'#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
@@ -380,6 +384,7 @@ class views_plugin_display_page extends views_plugin_display {
);
$form['menu']['context'] = array(
'#title' => t('Context'),
+ '#suffix' => '</div>',
'#type' => 'checkbox',
'#default_value' => !empty($menu['context']),
'#description' => t('Displays the link in contextual links'),
@@ -471,9 +476,8 @@ class views_plugin_display_page extends views_plugin_display {
form_error($form['path'], t('"%" may not be used for the first segment of a path.'));
}
- // automatically remove '/' from path.
- $form_state['values']['path'] = trim($form_state['values']['path'], '/');
-
+ // automatically remove '/' and trailing whitespace from path.
+ $form_state['values']['path'] = trim($form_state['values']['path'], '/ ');
break;
case 'menu':
$path = $this->get_option('path');