diff options
| author | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
| commit | fee85030933bd15788bde7c0e019803a27a55f84 (patch) | |
| tree | a2755c3dbd77b3210f2420a162a28030e3fc2865 /include/conversation.php | |
| parent | 6083cd255990c82380a85029b3951160eb558ac9 (diff) | |
| parent | fabf7081d39481bb22ee27c4beaf96e5529168eb (diff) | |
| download | volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.gz volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.bz2 volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php index 57dc9d2a2..2c447acbc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -674,7 +674,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $unverified = ''; // $tags=array(); -// $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN)); +// $terms = get_terms_oftype($item['term'],array(TERM_HASHTAG,TERM_MENTION,TERM_UNKNOWN,TERM_COMMUNITYTAG)); // if(count($terms)) // foreach($terms as $tag) // $tags[] = format_term_for_display($tag); @@ -944,7 +944,7 @@ function item_photo_menu($item){ $menu = Array( t("View Source") => $vsrc_link, t("Follow Thread") => $sub_link, - t("Stop Following") => $unsub_link, + t("Unfollow Thread") => $unsub_link, t("View Status") => $status_link, t("View Profile") => $profile_link, t("View Photos") => $photos_link, |