From 69060eca11b58d4e59b7369daa5ac713596c22e0 Mon Sep 17 00:00:00 2001
From: damiankloip <damiankloip@1037976.no-reply.drupal.org>
Date: Wed, 29 Aug 2012 19:50:55 +0200
Subject: [PATCH] Issue #1632504 by joachim, damiankloip: Fixed
 views_handler_field_term_link_edit() should check it actually has a term tid.

---
 .../taxonomy/Plugin/views/field/LinkEdit.php  | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
index 960f463804..6ac2f4dc73 100644
--- a/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
+++ b/lib/Views/taxonomy/Plugin/views/field/LinkEdit.php
@@ -55,17 +55,19 @@ function query() {
   }
 
   function render($values) {
-    // Mock a term object for taxonomy_term_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 = entity_create('taxonomy_term', array(
-      'vid' => $values->{$this->aliases['vid']},
-      'vocabulary_machine_name' => $values->{$this->aliases['vocabulary_machine_name']},
-    ));
-    if (taxonomy_term_access('edit', $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_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 = entity_create('taxonomy_term', array(
+        'vid' => $values->{$this->aliases['vid']},
+        'vocabulary_machine_name' => $values->{$this->aliases['vocabulary_machine_name']},
+      ));
+      if (taxonomy_term_access('edit', $term)) {
+        $text = !empty($this->options['text']) ? $this->options['text'] : t('edit');
+        return l($text, 'taxonomy/term/'. $tid . '/edit', array('query' => drupal_get_destination()));
+      }
     }
   }
 
-- 
GitLab