From: Michael Vogel <icarus@dabo.de>
Date: Mon, 2 Feb 2015 23:30:37 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9851965090184df4a138a0f9f4342adb61d07a4e;hp=86a968002d1efc4a8629d3080a9cf38eb5baabe8;p=friendica.git

Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage
---

diff --git a/include/api.php b/include/api.php
index 2d3c31af0c..c8a313ce19 100644
--- a/include/api.php
+++ b/include/api.php
@@ -848,7 +848,7 @@
 		// get last public wall message
 		$lastwall = q("SELECT `item`.*, `i`.`contact-id` as `reply_uid`, `i`.`author-link` AS `item-author`
 				FROM `item`, `item` as `i`
-				WHERE `item`.`contact-id` = %d
+				WHERE `item`.`contact-id` = %d AND `item`.`uid` = %d
 					AND ((`item`.`author-link` IN ('%s', '%s')) OR (`item`.`owner-link` IN ('%s', '%s')))
 					AND `i`.`id` = `item`.`parent`
 					AND `item`.`type`!='activity'
@@ -856,6 +856,7 @@
 				ORDER BY `item`.`created` DESC
 				LIMIT 1",
 				intval($user_info['cid']),
+				intval(api_user()),
 				dbesc($user_info['url']),
 				dbesc(normalise_link($user_info['url'])),
 				dbesc($user_info['url']),