Merge remote branch 'upstream/master'

[friendica.git] / mod / notes.php

diff --git a/mod/notes.php b/mod/notes.php
index 64cc17a653bca4f1ff1cd726a5bc8458303f9437..625bbd2eefa97354d84af10f2561bb13e36c4d4e 100644 (file)
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -81,7 +81,7 @@ 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 `item`.`origin` = 1
+               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 ",
@@ -97,7 +97,7 @@ 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 `item`.`origin` = 1
+               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
@@ -117,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`