--- views_nivo_slider.module.original	Fri Dec 03 10:36:57 2010
+++ views_nivo_slider.module	Thu Dec 16 03:00:40 2010
@@ -99,11 +99,12 @@
       $view->field[$options['link_field']]->options['format'] = 'plain';
     }
   }
   
   $attributes = NULL;
-
+  $alter = null;
+  
   foreach ($view->field as $id => $field) {
     $field_output = $view->field[$id]->theme($vars['row']);
 
     switch ($id) {
     case $options['image_field']:
@@ -117,11 +118,21 @@
         $view->_vns_captions[$title_id] = $title;
         $title_id = '#'.$title_id;
       }
       break;
     case $options['link_field']:
-      if ($field->definition['handler'] != 'views_handler_field_node_link') {
+      // make_link is TRUE when 'Link this field to its node' is checked,
+      // make_link is 1 when 'Output this field as a link' is checked.
+      if ($field->options['alter']['make_link'] == 1)
+      {
+        dpm($field->options['alter']);
+        $alter = $field->options['alter'];
+        $classes = explode(' ', $alter['link_class']);
+        $classes[] = 'views-processed';
+        $alter['link_class'] = implode(' ', $classes);
+      }
+      else if ($field->definition['handler'] != 'views_handler_field_node_link') {
         $link = check_url($field_output);
       }
       break;
     case $style['controlNavThumbsField']:
       if ($style['controlNav'] == 'thumbsField') {
@@ -138,11 +149,16 @@
     }
   }
 
   $img = theme('imagecache' , $presetname , $image_url, '', $title_id, $attributes, TRUE);
 
-  if ($link) {
+  if ($alter)
+  {
+     $alter['text'] = $img;
+     $img = $view->display_handler->handlers['field'][$id]->render_text($alter);
+  }
+  else if ($link) {
     $img = '<a href="'.$link.'" class="views-processed">'.$img.'</a>';
   }
 
 
   $object = new StdClass;
--- views_nivo_slider/views-nivo-slider-view.tpl.php.original	Thu Dec 16 01:20:30 2010
+++ views_nivo_slider/views-nivo-slider-view.tpl.php	Thu Dec 16 01:21:42 2010
@@ -36,16 +36,17 @@
     <div id="<?php print $views_nivo_slider_id ?>" class="views-nivo-slider clear-block"> 
       <?php foreach ($rows as $row): ?>
         <?php print $row?>
       <?php endforeach; ?>
     </div>
-    <?php foreach($view->_vns_captions as $vns_id => $vns_caption): ?>
-      <div id="<?php print $vns_id ?>" class="nivo-html-caption">
-        <?php print $vns_caption; ?>
-      </div>
-    <? endforeach; ?>
-
+    <?php if (isset($view->_vns_captions)): ?>
+      <?php foreach($view->_vns_captions as $vns_id => $vns_caption): ?>
+        <div id="<?php print $vns_id ?>" class="nivo-html-caption">
+          <?php print $vns_caption; ?>
+        </div>
+      <?php endforeach; ?>
+    <?php endif; ?>
   <?php elseif($empty): ?>
     <div class="view-empty">
       <?php print $empty; ?>
     </div>
   <?php endif; ?>