Merge branch 'master' of git://gitorious.org/laconica/mainline into 0.7.x

[quix0rs-gnu-social.git] / lib / jabber.php
diff --git a/lib/jabber.php b/lib/jabber.php

index f41d984d6261a46698f11cf27de238d8698e3ce1..3fbb3e1ab9ee0c04c9ad263cc3ba43654b97a39b 100644 (file)
--- a/lib/jabber.php
+++ b/lib/jabber.php
@@ -114,7 +114,7 @@ function jabber_connect($resource=null)
          try {
              $conn->connect(true); // true = persistent connection
          } catch (XMPPHP_Exception $e) {
-            common_log(LOG_ERROR, $e->getMessage());
+            common_log(LOG_ERR, $e->getMessage());
              return false;
          }
  
@@ -186,6 +186,11 @@ function jabber_format_entry($profile, $notice)
      $entry .= "<id>". $notice->uri . "</id>\n";
      $entry .= "<published>".common_date_w3dtf($notice->created)."</published>\n";
      $entry .= "<updated>".common_date_w3dtf($notice->modified)."</updated>\n";
+    if ($notice->reply_to) {
+        $replyurl = common_local_url('shownotice',
+                                     array('notice' => $notice->reply_to));
+        $entry .= "<link rel='related' href='" . $replyurl . "'/>\n";
+    }
      $entry .= "</entry>\n";
  
      $html  = "\n<html xmlns='http://jabber.org/protocol/xhtml-im'>\n";