harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some displayed links that were wonky

Browse Source
This commit is contained in:
friendica 2013-01-22 23:08:46 -08:00
parent d06c21dc39
commit b8c92a0a42
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ItemObject.php
View File

@ -49,6 +49,7 @@ class Item extends BaseObject {
// fixme // fixme
$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self')); $this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
// FIXME - base this on observer permissions // FIXME - base this on observer permissions
$this->writable = ((local_user() && $channel['channel_hash'] === $item['owner_xchan']) ? true : false); $this->writable = ((local_user() && $channel['channel_hash'] === $item['owner_xchan']) ? true : false);
@ -227,8 +228,8 @@ class Item extends BaseObject {
'body' => $body_e, 'body' => $body_e,
'text' => strip_tags($body_e), 'text' => strip_tags($body_e),
'id' => $this->get_id(), 'id' => $this->get_id(),
'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'linktitle' => sprintf( t('View %s\'s profile - %s'), $profile_name, $item['author']['xchan_addr']),
'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), 'olinktitle' => sprintf( t('View %s\'s profile - %s'), $this->get_owner_name(), $item['owner']['xchan_addr']),
'to' => t('to'), 'to' => t('to'),
'wall' => t('Wall-to-Wall'), 'wall' => t('Wall-to-Wall'),
'vwall' => t('via Wall-To-Wall:'), 'vwall' => t('via Wall-To-Wall:'),

8
include/nav.php
View File

@ -90,8 +90,12 @@ EOT;
); );
} }
if($observer)
$nav['lock'] = array('rmagic','',(($observer) ? 'lock' : 'unlock'), (($observer) ? $observer['xchan_addr'] : t('Click to authenticate to your home hub'))); $nav['lock'] = array('logout','','lock',
sprintf( t('%s - click to logout'), $observer['xchan_addr']));
else
$nav['lock'] = array('rmagic','','unlock',
t('Click to authenticate to your home hub'));
/** /**
* "Home" should also take you home from an authenticated remote profile connection * "Home" should also take you home from an authenticated remote profile connection