Index: flickr.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/flickr/flickr.module,v
retrieving revision 1.27
diff -u -b -r1.27 flickr.module
--- flickr.module       24 Jan 2007 18:42:16 -0000      1.27
+++ flickr.module       6 Feb 2007 16:56:37 -0000
@@ -49,7 +49,7 @@
   else {
     if (arg(0) == 'flickr' && is_numeric(arg(1)) && arg(1) > 0) {
       $account = user_load(array('uid' => arg(1)));
-      if ($account !== FALSE && isset($account->flickr['nsid'])) {
+      if ($account !== FALSE && $account->flickr['nsid']) {
         $nsid = $account->flickr['nsid'];
         $admin_access = user_access('administer flickr');
         // let a user view their own account or all if they have permission
@@ -76,7 +76,7 @@
       );

       }
-      elseif ($account !== FALSE && !isset($account->flickr['nsid'])) {
+      elseif ($account !== FALSE && !$account->flickr['nsid']) {
         drupal_set_message(t('%user does not have a Flickr account', array('%user'=>$account->name)), 'error');
         return '';
       }
@@ -212,15 +212,12 @@
       if (($nsid = flickr_user_find_by_identifier($edit['flickr_identifier'])) === FALSE) {
         form_set_error('flickr_identifier', t('%ident is not a valid Flickr username, email, or NSID.', array('%ident' => $edit['flickr_identifier'])));
       }
-      else {
-        $account->flickr['nsid'] = $nsid;
-      }
     }
   }
   elseif ($op == 'insert' || $op == 'update') {
     db_query('DELETE FROM {flickr_users} WHERE uid=%d', $account->uid);
-    if (!empty($edit['flickr_identifier'])) {
-      db_query('INSERT INTO {flickr_users} (uid, nsid, identifier) VALUES (%d, \'%s\', \'%s\')', $account->uid, $account->flickr['nsid'], $edit['flickr_identifier']);
+    if (!empty($edit['flickr_identifier']) && ($nsid = flickr_user_find_by_identifier($edit['flickr_identifier']))) {
+      db_query('INSERT INTO {flickr_users} (uid, nsid, identifier) VALUES (%d, \'%s\', \'%s\')', $account->uid, $nsid, $edit['flickr_identifier']);
     }
     unset($account->flickr);
   }
@@ -261,7 +258,7 @@

 function flickr_photos_get($uid, $tags=array(), $page=1, $other_args=array()){
   $account = user_load(array('uid' => $uid));
-  if (isset($account->flickr['nsid'])) {
+  if ($account->flickr['nsid']) {
     $nsid = $account->flickr['nsid'];
   }
   else {