? .DS_Store
? .buildpath
? .git
? .project
? .settings
? 152792_photosets.getPhotos_10.patch
? 152792_photosets.getPhotos_D6_15.patch
? block/.DS_Store
? field/.DS_Store
? field/flickrfield.module-edit
? filter/.DS_Store
? sets/.DS_Store
? tags/.DS_Store
Index: flickr.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr/flickr.inc,v
retrieving revision 1.31.2.3
diff -u -d -u -p -r1.31.2.3 flickr.inc
--- flickr.inc	17 Mar 2009 21:56:54 -0000	1.31.2.3
+++ flickr.inc	16 Apr 2009 22:35:40 -0000
@@ -339,6 +339,37 @@ function flickr_photoset_get_list($nsid)
 }
 
 /**
+ * @param $photoset_id
+ *   id of the photoset to get photos from
+ * @param $page
+ *   the page of results to return
+ * @param $per_page
+ *   the number of photos per page
+ *
+ * @return
+ *   response from the flickr method flickr.photosets.getPhotos
+ *   (http://www.flickr.com/services/api/flickr.photosets.getPhotos.html)
+ */
+function flickr_photoset_get_photos($photoset_id, $page = 1, $per_page = NULL) {
+  if (!isset($per_page)) {
+    $per_page = variable_get('flickr_photos_per_page', 20);
+  }
+
+  $response = flickr_request(
+    'flickr.photosets.getPhotos',
+    array(
+      'photoset_id' => $photoset_id,
+      'page' => $page,
+      'per_page' => $per_page,
+    )
+  );
+  if ($response) {
+    return $response['photoset'];
+  }
+  return FALSE;
+}
+
+/**
  * @param $nsid The Flickr user's NSID
  *
  * @return
Index: flickr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr/flickr.module,v
retrieving revision 1.42.2.6
diff -u -d -u -p -r1.42.2.6 flickr.module
--- flickr.module	17 Mar 2009 21:56:54 -0000	1.42.2.6
+++ flickr.module	16 Apr 2009 22:35:41 -0000
@@ -236,8 +236,8 @@ function theme_flickr_photos($uid, $phot
 function theme_flickr_photoset($ps, $owner, $size, $attribs = NULL) {
   if (module_exists('flickr_sets')) {
 	$output .= "<div class='flickr-photoset'>\n";
-	$photos = flickr_set_load($ps['id']);
-	foreach ((array) $photos['photoset']['photo'] as $photo) {
+  $photoset = flickr_photoset_get_photos($ps['id']);
+  foreach ((array) $photoset['photo'] as $photo) {
 	  //insert owner into $photo because theme_flickr_photo needs it
 	  $photo['owner'] = $owner;
 	  $output .= theme('flickr_photo', $photo, $size);
Index: sets/flickr_sets.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickr/sets/flickr_sets.module,v
retrieving revision 1.10.2.4
diff -u -d -u -p -r1.10.2.4 flickr_sets.module
--- sets/flickr_sets.module	25 Mar 2009 16:18:08 -0000	1.10.2.4
+++ sets/flickr_sets.module	16 Apr 2009 22:35:41 -0000
@@ -30,16 +30,10 @@ function flickr_sets_menu() {
   return $items;
 }
 
-function flickr_set_load($sid, $page = 1) {
+function flickr_set_load($sid) {
   // TODO: Not sure why this called for /flickr and does not show for admin role
   if (is_numeric($sid)) {	
-    return flickr_request('flickr.photosets.getPhotos',
-    array(
-      'photoset_id' => $sid,
-      'page' => $page,
-      'per_page' => variable_get('flickr_photos_per_page', 20),
-    )
-    );
+    return flickr_photoset_get_photos($sid);
   }
 }
 
@@ -80,7 +74,7 @@ function flickr_sets_photoset($account, 
   $uid = $user->uid;
   $nsid = $account->flickr['nsid'];
 
-  $set_id = $set['photoset']['id'];
+  $set_id = $set['id'];
   $set_info = flickr_photoset_get_info($set_id);
 
   //make sure that $nsid is the real owner of $set_id
@@ -95,22 +89,22 @@ function flickr_sets_photoset($account, 
   $per_page = variable_get('flickr_photos_per_page', 20);
 
   //request set photos
-  $set_response = flickr_set_load($set_id, $pager_page_array[$element] + 1);
+  $photoset = flickr_photoset_get_photos($set_id, $pager_page_array[$element] + 1, $per_page);
 
-  if (!$set_response) {
+  if (!$photoset) {
     drupal_set_message(t('Error retrieving :setid\'s photosets from Flickr'), array(':setid', $set_id));
     return '';
   }
-  elseif (!isset($set_response['photoset']['photo']) || empty($set_response['photoset']['photo'])) {
+  elseif (!isset($photoset['photo']) || empty($photoset['photo'])) {
       drupal_set_message('This photoset is empty');
       return '';
   }
 
   //set pager information we just acquired
-  $pager_total_items[$element] = $set_response['photoset']['total'];
-  $pager_total[$element] = $set_response['photoset']['pages'];
+  $pager_total_items[$element] = $photoset['total'];
+  $pager_total[$element] = $photoset['pages'];
 
-  return theme('flickr_sets_photoset', $uid, $per_page, $set_response, $set_info);
+  return theme('flickr_sets_photoset', $uid, $per_page, $photoset, $set_info);
 }
 
 /**
@@ -143,18 +137,16 @@ function theme_flickr_sets_photosets($ui
   return $output;
 }
 
-function theme_flickr_sets_photoset($uid, $per_page, $photo_arr, $set_info) {
-  $output =
-    theme('pager', NULL, variable_get('flickr_photos_per_page', 20));
+function theme_flickr_sets_photoset($uid, $per_page, $photoset, $set_info) {
+  $output = theme('pager', NULL, $per_page);
   $output .= "<div class='fickr-photoset'>\n";
-  foreach ((array) $photo_arr['photoset']['photo'] as $photo) {
+  foreach ((array) $photoset['photo'] as $photo) {
     //insert owner into $photo because theme_flickr_photo_box/flickr_photo_page_url needs it
     $photo['owner'] = $set_info['owner'];
     $output .= theme('flickr_photo_box', $photo, 'm');
   }
   $output .= '</div>';
-  $output .=
-    theme('pager', NULL, variable_get('flickr_photos_per_page', 20));
+  $output .= theme('pager', NULL, $per_page);
   return $output;
 }