From 6df98f080ba0c9a0309158c1ea5d48f95aae71ee Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Mon, 16 Nov 2015 19:17:39 -0800
Subject: fix api/direct_messages/new at least for the json case. We seem to
 have a missing template for XML

---
 include/api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

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));
-- 
cgit v1.2.3


From 868a0d8a90c5e582bb783247fbf3a26f5226b126 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Tue, 17 Nov 2015 13:45:00 +0100
Subject: missing closing " for src attribute

---
 include/conversation.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include')

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>'
 			);
 
-- 
cgit v1.2.3