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/network.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/network.php')
| -rw-r--r-- | mod/network.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/network.php b/mod/network.php index 7c4c1ac04..b998a3107 100644 --- a/mod/network.php +++ b/mod/network.php @@ -534,7 +534,7 @@ function network_content(&$a, $update = 0) { $parents_str = implode(', ', $parents_arr); $items = q("SELECT `item`.*, `item`.`id` AS `item_id`, - `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, `contact`.`writable`, + `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`, `contact`.`writable`, `contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid` FROM `item`, `contact` |