diff options
author | zottel <github@zottel.net> | 2012-06-03 14:21:51 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-06-03 14:21:51 +0200 |
commit | 70c4ab68754941749a5e89434d6db19f6bba1e16 (patch) | |
tree | 525a6536b6ab7f9020e83daf9287c785303ad584 /mod/notes.php | |
parent | df2fdf08ddf8cb354022992d4353ced4295b77b3 (diff) | |
parent | daa4f5213f726b22846859f2f12d06889e9bdc9b (diff) | |
download | volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.gz volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.tar.bz2 volse-hubzilla-70c4ab68754941749a5e89434d6db19f6bba1e16.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/notes.php')
-rw-r--r-- | mod/notes.php | 2 |
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` |