Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/actions/foaf.php b/actions/foaf.php
index 4420c2d5036cc59bf6bb4ad08fbcacce749e436a..997be9c735780700fbe057ca478cac45e69cf5f1 100644 (file)
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -90,7 +90,7 @@ class FoafAction extends ManagedAction
 
         // Would be nice to tell if they were a Person or not (e.g. a #person usertag?)
         $this->elementStart('Agent', array('rdf:about' => $this->user->getUri()));
-        if ($this->user->email) {
+        if (common_config('foaf', 'mbox_sha1sum') && $this->user->email) {
             $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email));
         }
         if ($this->profile->fullname) {