/[drupal]/contributions/modules/flickr/field/flickrfield.module
ViewVC logotype

Diff of /contributions/modules/flickr/field/flickrfield.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.4, Tue Sep 30 10:35:08 2008 UTC revision 1.4.2.1, Fri Jan 30 10:39:01 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: flickrfield.module,v 1.3 2008/03/24 19:56:09 drewish Exp $  // $Id: flickrfield.module,v 1.4 2008/09/30 10:35:08 karens Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 178  function theme_flickrfield_field_formatt Line 178  function theme_flickrfield_field_formatt
178      case 'set_id':      case 'set_id':
179        $photo_data = flickr_photoset_get_info($item['id']);        $photo_data = flickr_photoset_get_info($item['id']);
180        $img = flickr_img($photo_data, $formatter);        $img = flickr_img($photo_data, $formatter);
181        $photo_url = flickr_photo_page_url($photo_data['owner'], $photo_data['id']);        $photo_url = flickr_photoset_page_url($photo_data['owner'], $photo_data['id']);
182        return theme('flickrfield_photoset', $img, $photo_url, $formatter, $photo_data, $node);        return theme('flickrfield_photoset', $img, $photo_url, $formatter, $photo_data, $node);
183    }    }
184  }  }
# Line 196  function theme_flickrfield_photo($img, $ Line 196  function theme_flickrfield_photo($img, $
196      $output = '<div class="flickr-photo-img">'. $img .'</div>';      $output = '<div class="flickr-photo-img">'. $img .'</div>';
197    }    }
198    else {    else {
199      $output = '<div class="flickr-photo-img">'. l($img, 'node/'. $node->nid, array('title' => $title), NULL, NULL, TRUE, TRUE) . '</div>';      $output = '<div class="flickr-photo-img">'. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '</div>';
200    }    }
201    $output .= '<div class="flickr-citation"><cite>'. l(t('Source: Flickr'), $photo_url) .'</cite></div>';    $output .= '<div class="flickr-citation"><cite>'. l(t('Source: Flickr'), $photo_url) .'</cite></div>';
202    return $output;    return $output;
# Line 208  function theme_flickrfield_photoset($img Line 208  function theme_flickrfield_photoset($img
208      $output = '<div class="flickr-photoset-img">'. $img .'</div>';      $output = '<div class="flickr-photoset-img">'. $img .'</div>';
209    }    }
210    else {    else {
211      $output = '<div class="flickr-photoset-img">'. l($img, 'node/'. $node->nid, array('title' => $title), NULL, NULL, TRUE, TRUE) . '</div>';      $output = '<div class="flickr-photoset-img">'. l($img, 'node/'. $node->nid, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE)) . '</div>';
212    }    }
213    $output .= '<div class="flickr-citation"><cite>'. l(t('Source: Flickr'), $photo_url) .'</cite></div>';    $output .= '<div class="flickr-citation"><cite>'. l(t('Source: Flickr'), $photo_url) .'</cite></div>';
214    return $output;    return $output;
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.4.2.1
  ViewVC Help
Powered by ViewVC 1.1.2