diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-05-16 08:24:46 +0200 |
| commit | f2c0c40f6e488f1a8e62bda9449b28115f343cac (patch) | |
| tree | ae1418141f85be49b7d8cb3d2a0e8b2a7acc4eb4 /include/items.php | |
| parent | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (diff) | |
| parent | a65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce (diff) | |
| download | volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.gz volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.bz2 volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.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`, |