Properly unlink all old avatars when deleting/uploading a new

[quix0rs-gnu-social.git] / actions / foaf.php

diff --git a/actions/foaf.php b/actions/foaf.php
index 7f76c222cb29951405c0675893c8dea45f8b5b08..ee6ef85ef63e464883aee199332a9e6c4985d936 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -146,11 +146,13 @@ class FoafAction extends Action
             $this->elementStart('img');
             $this->elementStart('Image', array('rdf:about' => $avatar->url));
             foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
-                $scaled = $this->profile->getAvatar($size);
-                if (!$scaled->original) { // sometimes the original has one of our scaled sizes
+                try {
+                    $scaled = Avatar::getOriginal($this->profile);
                     $this->elementStart('thumbnail');
                     $this->element('Image', array('rdf:about' => $scaled->url));
                     $this->elementEnd('thumbnail');
+                } catch (Exception $e) {
+                    // This avatar did not exist
                 }
             }
             $this->elementEnd('Image');