diff options
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/include/conversation.php b/include/conversation.php index 2d72f3489..a2cca1c77 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -255,7 +255,7 @@ function localize_item(&$item){ $A = '[zrl=' . chanlink_url($Alink) . ']' . $Aname . '[/zrl]'; - $txt = t('%1$s is currently %2$s'); + $txt = t('%1$s is %2$s','mood'); $item['body'] = sprintf($txt, $A, t($verb)); } @@ -909,7 +909,7 @@ function item_photo_menu($item){ } if((local_user()) && local_user() == $item['uid']) { - $vsrc_link = $a->get_baseurl() . '/viewsrc/' . $item['id']; + $vsrc_link = 'javascript:viewsrc(' . $item['id'] . '); return false;'; if($item['parent'] == $item['id'] && $channel && ($channel_hash != $item['author_xchan'])) { $sub_link = 'javascript:dosubthread(' . $item['id'] . '); return false;'; } @@ -1314,12 +1314,18 @@ function prepare_page($item) { $naked = 1; // ... other possible options } + + // prepare_body calls unobscure() as a side effect. Do it here so that + // the template will get passed an unobscured title. + + $body = prepare_body($item,true); + return replace_macros(get_markup_template('page_display.tpl'),array( '$author' => (($naked) ? '' : $item['author']['xchan_name']), '$auth_url' => (($naked) ? '' : zid($item['author']['xchan_url'])), '$date' => (($naked) ? '' : datetime_convert('UTC',date_default_timezone_get(),$item['created'],'Y-m-d H:i')), '$title' => smilies(bbcode($item['title'])), - '$body' => prepare_body($item,true), + '$body' => $body, '$preview' => $preview, '$link' => $link, )); @@ -1517,25 +1523,17 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ require_once('include/chat.php'); $chats = chatroom_list($uid); - $subdued = ((count($chats)) ? '' : ' subdued'); - $tabs[] = array( - 'label' => t('Chatrooms'), - 'url' => $a->get_baseurl() . '/chat/' . $nickname, - 'sel' => ((argv(0) == 'chat') ? 'active' . $subdued : '' . $subdued), - 'title' => t('Chatrooms'), - 'id' => 'chat-tab', - ); - - - if($is_owner) { + if (count($chats)) { $tabs[] = array( - 'label' => t('Events'), - 'url' => $a->get_baseurl() . '/events', - 'sel' => ((argv(0) == 'events') ? 'active' : ''), - 'title' => t('Events and Calendar'), - 'id' => 'events-tab', + 'label' => t('Chatrooms'), + 'url' => $a->get_baseurl() . '/chat/' . $nickname, + 'sel' => ((argv(0) == 'chat') ? 'active' : '' ), + 'title' => t('Chatrooms'), + 'id' => 'chat-tab', ); + } + if($is_owner) { $tabs[] = array( 'label' => t('Bookmarks'), 'url' => $a->get_baseurl() . '/bookmarks', |