From: dongsheng <dongsheng>
Date: Mon, 22 Sep 2008 01:30:14 +0000 (+0000)
Subject: "MDL-15488, fix problem when user use flickr account from form"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=aa48f05da844001b8583702b498be8e76ea35b6a;p=moodle.git

"MDL-15488, fix problem when user use flickr account from form"
---

diff --git a/repository/flickr_public/repository.class.php b/repository/flickr_public/repository.class.php
index 864963b7fa..ee28a51467 100644
--- a/repository/flickr_public/repository.class.php
+++ b/repository/flickr_public/repository.class.php
@@ -83,10 +83,16 @@ class repository_flickr_public extends repository {
             $people = $this->flickr->people_findByEmail($account);
             if (!empty($people)) {
                 $this->flickr_account = $account;
+                set_user_preference('flickr_mail_'.$this->id, $account);
             } else {
                 throw new repository_exception('invalidemail', 'repository_flickr_public');
             }
         }
+
+        $user_mail = get_user_preferences('flickr_mail_'.$this->id, '');
+        if (empty($this->flickr_account) && !empty($user_mail)) {
+            $this->flickr_account = $user_mail;
+        }
     }
 
     /**
@@ -114,6 +120,15 @@ class repository_flickr_public extends repository {
         }
     }
 
+    /**
+     *
+     * @return <type>
+     */
+    public function logout() {
+        set_user_preference('flickr_mail_'.$this->id, '');
+        return $this->print_login();
+    }
+
     /**
      *
      * @param <type> $search_text