From: Roland Haeder <roland@mxchange.org>
Date: Sun, 24 Jan 2016 15:13:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3326b7b850f538f0e3c2c7969c5e566e2a374ffb;p=quix0rs-gnu-social.git

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

3326b7b850f538f0e3c2c7969c5e566e2a374ffb
diff --cc plugins/OStatus/classes/Ostatus_profile.php
index 9d41b67273,a8269bdf07..07432d78fa
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@@ -371,20 -371,24 +371,25 @@@ class Ostatus_profile extends Managed_D
       * send immediately but won't get the return value.
       *
       * @param mixed $entry XML string, Notice, or Activity
 +     * @param Profile $actor Acting profile
       * @return boolean success
       */
 -    public function notifyDeferred($entry, $actor)
 +    public function notifyDeferred($entry, Profile $actor)
      {
          if ($this->salmonuri) {
-             common_debug("OSTATUS: user {$actor->getNickname()} ({$actor->getID()}) wants to ping {$this->localProfile()->getNickname()} on {$this->salmonuri}");
-             $data = array('salmonuri' => $this->salmonuri,
-                           'entry' => $this->notifyPrepXml($entry),
-                           'actor' => $actor->getID(),
-                           'target' => $this->localProfile()->getID());
- 
-             $qm = QueueManager::get();
-             return $qm->enqueue($data, 'salmon');
+             try {
+                 common_debug("OSTATUS: user {$actor->getNickname()} ({$actor->getID()}) wants to ping {$this->localProfile()->getNickname()} on {$this->salmonuri}");
+                 $data = array('salmonuri' => $this->salmonuri,
+                               'entry' => $this->notifyPrepXml($entry),
+                               'actor' => $actor->getID(),
+                               'target' => $this->localProfile()->getID());
+ 
+                 $qm = QueueManager::get();
+                 return $qm->enqueue($data, 'salmon');
+             } catch (Exception $e) {
+                 common_log(LOG_ERR, 'OSTATUS: Something went wrong when creating a Salmon slap: '._ve($e->getMessage()));
+                 return false;
+             }
          }
  
          return false;