Merge branch 'twitter-check-dupe-by-uri' into 'master'

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

index 2576bcc111fc65b394f48f2acd74b8f763803087..23386868ddbc1b042b3151b29340b952c86cf35c 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -70,7 +70,7 @@ class ShownoticeAction extends ManagedAction
      {
          parent::prepare($args);
          if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
+            GNUsocial::setApi(true);
          }
  
          $this->notice = $this->getNotice();
@@ -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',