409995 - Flickr message after account creation

Status: RESOLVED FIXED

(Websites Graveyard :: spreadfirefox.com, defect, P1)

Description

[Alix Franquet [:alix]]

Create an account on the new spreadfirefox.com, click on the 1-time login URL to set your password, the confirmation message includes the following: "<username>'s Flickr page has been deleted"

The same thing happens when editing one's account (from the My Stuff->My Account page).

The message will be confusing to users who never entered a flickr identifier. Is it possible to remove it for those users?

Comment 1

[Alex Polvi]

This is coming from the flickr module: trunk/sites/all/modules/flickr/flickr.module

You can recreate it by editing "my account" and hitting submit without changing anything.

My best guess is that drupal sets the $op to 'update' in this case -- and the logic of the module causes to hit the conditional in which the message is printed.

  elseif ($op == 'insert' || $op == 'update') {

There needs to be some validating to make sure that the message is only printed when the 'flickr_identifier' field goes from being not null to null. Right now it is being printed whenever the page is updated and the 'flickr_identifier' is null.

    elseif ($op == 'insert' || $op == 'update') {
    if (isset($edit['flickr_identifier'])) {
      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, flickr_user_find_by_identifier($edit['flickr_identifier']), $edit['flickr_identifier']);
      }
      else {
        //flickr account deleted
        drupal_set_message(t('%username\'s Flickr page has been deleted.', array('%username'=> $account->name)));
      }
    }

Comment 2

[Chris Pollett]

Attachment: patch to fix problem and also gets rid of ^M's

The contentful part of the patch is essentially where polvi suggests. I moved where the delete messages is given. The patch is a bit longer that just that though, because the whole file had a bunch of ^M's in it. I also reformatted some long lines in the sfx_affiliates module. I didn't change any code though in these sections. Polvi's method for re-creating the problem was also used. Go to My Account, click edit and then submit without changing anything. Before patch will get the Flickr account deleted message, afterwards you won't.

Comment 3

[Ryan Doherty (:rdoherty)]

Patch isn't working for me, not sure why. I svn up'd just before applying.

patching file sites/all/modules/flickr/flickr.module
Hunk #1 FAILED at 80.
Hunk #4 FAILED at 464.
Hunk #5 FAILED at 490.
Hunk #6 FAILED at 527.

Comment 4

[Chris Pollett]

Attachment: revised patch

Comment 5

[Ryan Doherty (:rdoherty)]

Comment on attachment 321979 [details] [diff] [review]
revised patch

Confirmed, no more flickr account info shown!

Comment 6

[Chris Pollett]

Thanks for your help Ryan,

Checked-into r13431