aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-01-22 23:08:46 -0800
committerfriendica <info@friendica.com>2013-01-22 23:08:46 -0800
commitb8c92a0a4285dae8d61750dc1b39c61bba6a3dda (patch)
tree1ff0e92fc45890d889ba70cc87865df92354cbe7
parentd06c21dc39b21d58f4c50e0f243a1d95c4137a6b (diff)
downloadvolse-hubzilla-b8c92a0a4285dae8d61750dc1b39c61bba6a3dda.tar.gz
volse-hubzilla-b8c92a0a4285dae8d61750dc1b39c61bba6a3dda.tar.bz2
volse-hubzilla-b8c92a0a4285dae8d61750dc1b39c61bba6a3dda.zip
fix some displayed links that were wonky
-rw-r--r--include/ItemObject.php5
-rw-r--r--include/nav.php8
2 files changed, 9 insertions, 4 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 6f9eaa18e..b6f1e53a4 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -49,6 +49,7 @@ class Item extends BaseObject {
// fixme
$this->writable = ($this->get_data_value('writable') || $this->get_data_value('self'));
// FIXME - base this on observer permissions
+
$this->writable = ((local_user() && $channel['channel_hash'] === $item['owner_xchan']) ? true : false);
@@ -227,8 +228,8 @@ class Item extends BaseObject {
'body' => $body_e,
'text' => strip_tags($body_e),
'id' => $this->get_id(),
- 'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
- 'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-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(), $item['owner']['xchan_addr']),
'to' => t('to'),
'wall' => t('Wall-to-Wall'),
'vwall' => t('via Wall-To-Wall:'),
diff --git a/include/nav.php b/include/nav.php
index b65577e0f..3a565af55 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -90,8 +90,12 @@ EOT;
);
}
-
- $nav['lock'] = array('rmagic','',(($observer) ? 'lock' : 'unlock'), (($observer) ? $observer['xchan_addr'] : t('Click to authenticate to your home hub')));
+ if($observer)
+ $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