diff options
| author | Friendika <info@friendika.com> | 2011-04-04 01:22:05 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-04 01:22:05 -0700 |
| commit | 379af2521559c263622348bce41872b61067e532 (patch) | |
| tree | 1e082da12910b6e7ee187c64a2f8ade50479516b /mod/network.php | |
| parent | b5bcf44354410e2c37d5ec143c7050c3903200ed (diff) | |
| parent | 890753e5b545ca5777c6c9084e99cacf42a3b485 (diff) | |
| download | volse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.gz volse-hubzilla-379af2521559c263622348bce41872b61067e532.tar.bz2 volse-hubzilla-379af2521559c263622348bce41872b61067e532.zip | |
Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup
Conflicts:
mod/dfrn_poll.php
Diffstat (limited to 'mod/network.php')
| -rw-r--r-- | mod/network.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mod/network.php b/mod/network.php index a304c211f..42c6c0c29 100644 --- a/mod/network.php +++ b/mod/network.php @@ -217,6 +217,7 @@ function network_content(&$a, $update = 0) { intval($a->pager['start']), intval($a->pager['itemspage']) ); + } else { @@ -323,11 +324,12 @@ function network_content(&$a, $update = 0) { $drop = replace_macros($droptpl,array('$id' => $item['id'])); $lock = '<div class="wall-item-lock"></div>'; - + $o .= replace_macros($tpl,array( '$id' => $item['item_id'], '$linktitle' => t('View $name\'s profile'), '$profile_url' => $profile_link, + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$sparkle' => $sparkle, '$lock' => $lock, @@ -551,6 +553,7 @@ function network_content(&$a, $update = 0) { $indent .= ' shiny'; + // Build the HTML $tmp_item = replace_macros($template,array( @@ -561,6 +564,7 @@ function network_content(&$a, $update = 0) { '$wall' => t('Wall-to-Wall'), '$vwall' => t('via Wall-To-Wall:'), '$profile_url' => $profile_link, + '$item_photo_menu' => item_photo_menu($item), '$name' => $profile_name, '$thumb' => $profile_avatar, '$osparkle' => $osparkle, @@ -604,4 +608,4 @@ function network_content(&$a, $update = 0) { } return $o; -}
\ No newline at end of file +} |