diff options
| author | zotlabs <mike@macgirvin.com> | 2018-06-17 17:47:04 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-06-17 17:47:04 -0700 |
| commit | 1cb60c7f5e97fb5c78fea4f910ec0e7d5076aab5 (patch) | |
| tree | 38a19fb0a28877d3324378c10caaadcf056249ae /include | |
| parent | e4ed0f8acd5a994d7098e89e4408698d3b7a6129 (diff) | |
| parent | 28043726e64f750e646b42aa6f649e277fc3767e (diff) | |
| download | volse-hubzilla-1cb60c7f5e97fb5c78fea4f910ec0e7d5076aab5.tar.gz volse-hubzilla-1cb60c7f5e97fb5c78fea4f910ec0e7d5076aab5.tar.bz2 volse-hubzilla-1cb60c7f5e97fb5c78fea4f910ec0e7d5076aab5.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/group.php | 8 | ||||
| -rw-r--r-- | include/text.php | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/include/group.php b/include/group.php index 03ebf7ee5..56bf210ff 100644 --- a/include/group.php +++ b/include/group.php @@ -279,14 +279,6 @@ function group_side($every="connections",$each="group",$edit = false, $group_id } $groups = array(); - - $groups[] = array( - 'text' => t('All Channels'), - 'id' => 0, - 'selected' => (($group_id == 0) ? 'group-selected' : ''), - 'href' => $every . (($every === 'network') ? '?f=&gid=0' : ''), - ); - $r = q("SELECT * FROM groups WHERE deleted = 0 AND uid = %d ORDER BY gname ASC", intval($_SESSION['uid']) diff --git a/include/text.php b/include/text.php index a8c28d7bd..8bade6e90 100644 --- a/include/text.php +++ b/include/text.php @@ -1018,21 +1018,30 @@ function magiclink_url($observer,$myaddr,$url) { -function micropro($contact, $redirect = false, $class = '', $textmode = false) { +function micropro($contact, $redirect = false, $class = '', $mode = false) { if($contact['click']) $url = '#'; else $url = chanlink_hash($contact['xchan_hash']); - return replace_macros(get_markup_template(($textmode)?'micropro_txt.tpl':'micropro_img.tpl'),array( + + $tpl = 'micropro_img.tpl'; + if($mode === true) + $tpl = 'micropro_txt.tpl'; + if($mode === 'card') + $tpl = 'micropro_card.tpl'; + + return replace_macros(get_markup_template($tpl), array( '$click' => (($contact['click']) ? $contact['click'] : ''), '$class' => $class . (($contact['archived']) ? ' archived' : ''), '$oneway' => (($contact['oneway']) ? true : false), '$url' => $url, '$photo' => $contact['xchan_photo_s'], '$name' => $contact['xchan_name'], + '$addr' => $contact['xchan_addr'], '$title' => $contact['xchan_name'] . ' [' . $contact['xchan_addr'] . ']', + '$network' => sprintf(t('Network: %s'), $contact['xchan_network']) )); } |