summaryrefslogtreecommitdiff
path: root/kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
diff options
context:
space:
mode:
Diffstat (limited to 'kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc')
-rw-r--r--kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc23
1 files changed, 13 insertions, 10 deletions
diff --git a/kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc b/kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
index 75ab0f8..2efb4a6 100644
--- a/kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
+++ b/kolab.org/www/drupal-7.18/sites/all/modules/views/modules/taxonomy/views_handler_field_term_link_edit.inc
@@ -44,16 +44,19 @@ class views_handler_field_term_link_edit extends views_handler_field {
}
function render($values) {
- // Mock a term object for taxonomy_term_edit_access(). Use machine name and
- // vid to ensure compatibility with vid based and machine name based
- // access checks. See http://drupal.org/node/995156
- $term = new stdClass();
- $term->vid = $values->{$this->aliases['vid']};
- $term->vocabulary_machine_name = $values->{$this->aliases['vocabulary_machine_name']};
- if (taxonomy_term_edit_access($term)) {
- $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
- $tid = $this->get_value($values, 'tid');
- return l($text, 'taxonomy/term/'. $tid . '/edit', array('query' => drupal_get_destination()));
+ // Check there is an actual value, as on a relationship there may not be.
+ if ($tid = $this->get_value($values, 'tid')) {
+ // Mock a term object for taxonomy_term_edit_access(). Use machine name and
+ // vid to ensure compatibility with vid based and machine name based
+ // access checks. See http://drupal.org/node/995156
+ $term = new stdClass();
+ $term->vid = $values->{$this->aliases['vid']};
+ $term->vocabulary_machine_name = $values->{$this->aliases['vocabulary_machine_name']};
+ if (taxonomy_term_edit_access($term)) {
+ $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
+ $tid = $this->get_value($values, 'tid');
+ return l($text, 'taxonomy/term/'. $tid . '/edit', array('query' => drupal_get_destination()));
+ }
}
}
}