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

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

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

revision 1.42.2.3, Sun Feb 8 20:05:41 2009 UTC revision 1.42.2.4, Tue Feb 17 16:47:24 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: flickr.module,v 1.42.2.2 2009/01/30 10:39:01 paulbooker Exp $  // $Id: flickr.module,v 1.42.2.3 2009/02/08 20:05:41 paulbooker Exp $
3    
4  require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');  require_once(drupal_get_path('module', 'flickr') .'/flickr.inc');
5    
# Line 187  function flickr_photos($user = NULL) { Line 187  function flickr_photos($user = NULL) {
187      $uid = $account->uid;      $uid = $account->uid;
188    }    }
189    
190      $nsid = flickr_user_find_by_identifier($nsid);
191    $photos = flickr_photos_search($nsid, $pager_page_array[$element] + 1);    $photos = flickr_photos_search($nsid, $pager_page_array[$element] + 1);
192    if (!$photos) {    if (!$photos) {
193      drupal_set_message(t('No accessible photos found for Flickr %userid', array('%userid' => $nsid)));      drupal_set_message(t('No accessible photos found for Flickr %userid', array('%userid' => $nsid)));
# Line 233  function theme_flickr_photos($uid, $phot Line 234  function theme_flickr_photos($uid, $phot
234  }  }
235    
236  function theme_flickr_photoset($ps, $owner, $size, $attribs = NULL) {  function theme_flickr_photoset($ps, $owner, $size, $attribs = NULL) {
237   $img = flickr_img($ps, $size, $attribs);    $output = theme('pager', NULL, variable_get('flickr_photos_per_page', 20));    $img = flickr_img($ps, $size, $attribs);
238    $photo_url = flickr_photoset_page_url($owner, $ps['id']);    $output .= "<div class='flickr-photoset'>\n";    $output = theme('pager', NULL, variable_get('flickr_photos_per_page', 20));
239    $title = is_array($ps['title']) ? $ps['title']['_content'] : $ps['title'];    $photos = flickr_set_load($ps['id']);    $photo_url = flickr_photoset_page_url($owner, $ps['id']);
240      $output .= "<div class='flickr-photoset'>\n";
241      $title = is_array($ps['title']) ? $ps['title']['_content'] : $ps['title'];
242    return l($img, $photo_url, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE));    return l($img, $photo_url, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE));
243  }  }
244    
Legend:
Removed from v.1.42.2.3  
changed lines
  Added in v.1.42.2.4
  ViewVC Help
Powered by ViewVC 1.1.2