Index: views_handler_field_node.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/views/modules/node/views_handler_field_node.inc,v
retrieving revision 1.3.2.8
diff -u -r1.3.2.8 views_handler_field_node.inc
--- views_handler_field_node.inc	12 Oct 2010 21:10:06 -0000	1.3.2.8
+++ views_handler_field_node.inc	10 Nov 2010 22:22:56 -0000
@@ -45,21 +45,23 @@
    * Data should be made XSS safe prior to calling this function.
    */
   function render_link($data, $values) {
-    if (!empty($this->options['link_to_node']) && $data !== NULL && $data !== '') {
-      $this->options['alter']['make_link'] = TRUE;
-      $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
-      if (isset($this->aliases['language'])) {
-        $languages = language_list();
-        if (isset($languages[$values->{$this->aliases['language']}])) {
-          $this->options['alter']['language'] = $languages[$values->{$this->aliases['language']}];
-        }
-        else {
-          unset($this->options['alter']['language']);
+    if (!empty($this->options['link_to_node'])) {
+      if ($data !== NULL && $data !== '') {
+        $this->options['alter']['make_link'] = TRUE;
+        $this->options['alter']['path'] = "node/" . $values->{$this->aliases['nid']};
+        if (isset($this->aliases['language'])) {
+          $languages = language_list();
+          if (isset($languages[$values->{$this->aliases['language']}])) {
+            $this->options['alter']['language'] = $languages[$values->{$this->aliases['language']}];
+          }
+          else {
+            unset($this->options['alter']['language']);
+          }
         }
       }
-    }
-    else {
-      $this->options['alter']['make_link'] = FALSE;
+      else {
+        $this->options['alter']['make_link'] = FALSE;
+      } 
     }
     return $data;
   }