X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnotes.php;h=625bbd2eefa97354d84af10f2561bb13e36c4d4e;hb=315784444af3145e6afba210731f0104d21f9db3;hp=e6e2b44fb0c3714365fb46c72433c693018bbb79;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

diff --git a/mod/notes.php b/mod/notes.php
index e6e2b44fb0..625bbd2eef 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -80,8 +80,9 @@ function notes_content(&$a,$update = false) {
 
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 
+		AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
 		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
 		$sql_extra ",
 		intval(local_user())
@@ -95,8 +96,9 @@ function notes_content(&$a,$update = false) {
 
 	$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
-		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 
+		and `item`.`moderated` = 0 AND `item`.`type` = 'note'
+		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
 		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
 		$sql_extra
 		ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
@@ -115,7 +117,7 @@ function notes_content(&$a,$update = false) {
 		$parents_str = implode(', ', $parents_arr);
  
 		$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
-			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`network`, `contact`.`rel`, 
+			`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`network`, `contact`.`rel`, 
 			`contact`.`thumb`, `contact`.`self`, `contact`.`writable`, 
 			`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
 			FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`