diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-17 16:49:11 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-11-17 16:49:11 +0100 |
| commit | c545ada746a384988172ea1ce28d43dd4ac276b3 (patch) | |
| tree | e7382c559927dbe39b9b175f827bbe9efab7b5db /include | |
| parent | 69487389d362285aeeb5106097864ec982c08a59 (diff) | |
| parent | 868a0d8a90c5e582bb783247fbf3a26f5226b126 (diff) | |
| download | volse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.tar.gz volse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.tar.bz2 volse-hubzilla-c545ada746a384988172ea1ce28d43dd4ac276b3.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 4 | ||||
| -rw-r--r-- | include/conversation.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/api.php b/include/api.php index 53adcc868..f781987d1 100644 --- a/include/api.php +++ b/include/api.php @@ -909,7 +909,7 @@ require_once('include/api_auth.php'); function red_item(&$a, $type) { if (api_user() === false) { - logger('api_red_item_new: no user'); + logger('api_red_item_full: no user'); return false; } @@ -2196,7 +2196,7 @@ require_once('include/api_auth.php'); } } - $id = send_message($recipient['id'], $_POST['text'], $sub, $replyto); + $id = send_message(api_user(),$recipient['guid'], $_POST['text'], $sub, $replyto); if ($id>-1) { $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); diff --git a/include/conversation.php b/include/conversation.php index a7d5f3fa5..09a6d51d7 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1025,7 +1025,7 @@ function builtin_activity_puller($item, &$conv_responses) { if((activity_match($item['verb'], $verb)) && ($item['id'] != $item['parent'])) { $name = (($item['author']['xchan_name']) ? $item['author']['xchan_name'] : t('Unknown')); $url = (($item['author']['xchan_url'] && $item['author']['xchan_photo_s']) - ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . ' alt="' . urlencode($name) . '" /> ' . $name . '</a>' + ? '<a href="' . chanlink_url($item['author']['xchan_url']) . '">' . '<img class="response-photo" src="' . zid($item['author']['xchan_photo_s']) . '" alt="' . urlencode($name) . '" /> ' . $name . '</a>' : '<a href="#" class="disabled">' . $name . '</a>' ); |