diff options
author | zottel <github@zottel.net> | 2012-05-14 13:59:37 +0200 |
---|---|---|
committer | zottel <github@zottel.net> | 2012-05-14 13:59:37 +0200 |
commit | 584b15aaecbf6f58cda2031908f0319c6dfc0700 (patch) | |
tree | 0b56a9e4de6c38a052878f2a5c18a05dae15c57c /include/items.php | |
parent | c43a03e21bcd12b24be8a59741ec6591c1f651d7 (diff) | |
parent | 59aefd9346fbd0d5c3cd9cdbf2158719221412f9 (diff) | |
download | volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.tar.gz volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.tar.bz2 volse-hubzilla-584b15aaecbf6f58cda2031908f0319c6dfc0700.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rw-r--r-- | include/items.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php index b1dc1708f..129499967 100644 --- a/include/items.php +++ b/include/items.php @@ -119,7 +119,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) $check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s'); $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, + `contact`.`name`, `contact`.`network`, `contact`.`photo`, `contact`.`url`, `contact`.`name-date`, `contact`.`uri-date`, `contact`.`avatar-date`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `contact-id`, `contact`.`uid` AS `contact-uid`, |