aboutsummaryrefslogtreecommitdiffstats
path: root/mod/notes.php
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-06-04 08:09:15 +0200
committerMichael Vogel <icarus@dabo.de>2012-06-04 08:09:15 +0200
commit0353410cd4b8153fd2b6e9d3524c6e46ad4acd68 (patch)
treee93cc7977a7367eb6281c733d9a34730dae3bf95 /mod/notes.php
parent5de91c2a7c924ac6067828a0e5bfbef5572c1f39 (diff)
parentca105f1c669950768a1f4cd6b93f471cabbc5114 (diff)
downloadvolse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.gz
volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.tar.bz2
volse-hubzilla-0353410cd4b8153fd2b6e9d3524c6e46ad4acd68.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notes.php')
-rw-r--r--mod/notes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/notes.php b/mod/notes.php
index 703c898e6..625bbd2ee 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -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`