? actitivitystream_flickrapi.patch
Index: activitystream_flickr/activitystream_flickr.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream_flickr/activitystream_flickr.info,v
retrieving revision 1.4
diff -u -p -r1.4 activitystream_flickr.info
--- activitystream_flickr/activitystream_flickr.info	12 Aug 2008 06:02:03 -0000	1.4
+++ activitystream_flickr/activitystream_flickr.info	24 Nov 2010 00:21:53 -0000
@@ -2,6 +2,7 @@
 
 name = Flickr Stream
 description = Your activity on Flickr
-dependencies[] = activitystream 
+dependencies[] = activitystream
+dependencies[] = flickrapi
 package = Activity Stream
 core = 6.x
\ No newline at end of file
Index: activitystream_flickr/activitystream_flickr.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/activitystream/activitystream_flickr/activitystream_flickr.module,v
retrieving revision 1.4
diff -u -p -r1.4 activitystream_flickr.module
--- activitystream_flickr/activitystream_flickr.module	12 Aug 2008 06:02:03 -0000	1.4
+++ activitystream_flickr/activitystream_flickr.module	24 Nov 2010 00:21:53 -0000
@@ -1,8 +1,6 @@
 <?php
 // $Id: activitystream_flickr.module,v 1.4 2008/08/12 06:02:03 akalsey Exp $
 
-include('phpFlickr.php');
-
 /*
  * The API passes in a $user object that contains four properties:
  * uid, userid, password, feed. These properties contain the account
@@ -16,7 +14,10 @@ function activitystream_flickr_streamapi
   if (!$user->userid) {
     return;
   }
-  $f = new phpFlickr(variable_get('activitystream_flickr_key', ''));
+  $f = flickrapi_phpFlickr();
+  if (!$f) {
+    return FALSE;
+  }
   $person = $f->people_findByUsername($user->userid);
   $baseurl = $f->urls_getUserPhotos($person['id']);
   $photos = $f->people_getPublicPhotos($person['id'], NULL, 10);