issue #395, item 2

This commit is contained in:
friendica
2014-04-06 03:47:53 -07:00
parent ad60e2c566
commit 64dfe3ab64
6 changed files with 26 additions and 9 deletions

View File

@@ -49,8 +49,13 @@ function bookmarks_content(&$a) {
require_once('include/menu.php');
require_once('include/conversation.php');
$o = '<h3>' . t('My Bookmarks') . '</h3>';
$channel = $a->get_channel();
$o = profile_tabs($a,true,$channel['channel_address']);
$o .= '<h3>' . t('My Bookmarks') . '</h3>';
$x = menu_list(local_user(),'',MENU_BOOKMARK);

View File

@@ -145,6 +145,7 @@ function chat_content(&$a) {
if(argc() > 2 && intval(argv(2))) {
$room_id = intval(argv(2));
$bookmark_link = get_bookmark_link($ob);
@@ -210,12 +211,13 @@ function chat_content(&$a) {
require_once('include/conversation.php');
$o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false));
require_once('include/widgets.php');
$o = replace_macros(get_markup_template('chatrooms.tpl'), array(
$o .= replace_macros(get_markup_template('chatrooms.tpl'), array(
'$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']),
'$baseurl' => z_root(),
'$nickname' => $channel['channel_address'],

View File

@@ -163,7 +163,10 @@ function events_content(&$a) {
$o ="";
// tabs
$tabs = profile_tabs($a, True);
$channel = $a->get_channel();
$tabs = profile_tabs($a, True, $channel['channel_address']);

View File

@@ -73,9 +73,10 @@ function webpages_content(&$a) {
else
$channel_acl = array();
require_once('include/conversation.php');
$o = profile_tabs($a,true);
$o .= '<h2>' . t('Webpages') . '</h2>';
$x = array(
'webpage' => ITEM_WEBPAGE,