Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / actions / shownotice.php
diff --git a/actions/shownotice.php b/actions/shownotice.php

index cf50ee8ad8fd38736d503f94b816961468c3eff7..f627b71f714ef8870228d5a0629a3a550ae7e92a 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -222,25 +222,12 @@ class ShownoticeAction extends ManagedAction
      /**
       * Extra <head> content
       *
-     * We show the microid(s) for the author, if any.
+     * Facebook OpenGraph metadata.
       *
       * @return void
       */
      function extraHead()
      {
-        $user = User::getKV($this->profile->id);
-
-        if (!$user instanceof User) {
-            return;
-        }
-
-        if ($user->emailmicroid && $user->email && $this->notice->uri) {
-            $id = new Microid('mailto:'. $user->email,
-                              $this->notice->uri);
-            $this->element('meta', array('name' => 'microid',
-                                         'content' => $id->toString()));
-        }
-
          // Extras to aid in sharing notices to Facebook
          $avatarUrl = $this->profile->avatarUrl(AVATAR_PROFILE_SIZE);
          $this->element('meta', array('property' => 'og:image',