aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-06 03:47:53 -0700
committerfriendica <info@friendica.com>2014-04-06 03:47:53 -0700
commit64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff (patch)
treed7d10dfec58c11ee8b44feb2141b971c36c38532 /include
parentad60e2c566930409d853517ca9392f169fc8e747 (diff)
downloadvolse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.tar.gz
volse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.tar.bz2
volse-hubzilla-64dfe3ab64a7f39c2c88d141a7d8a8b9d60756ff.zip
issue #395, item 2
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php6
-rw-r--r--include/reddav.php6
2 files changed, 9 insertions, 3 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 880639bf4..149da3ac7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1472,6 +1472,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
if (is_null($nickname))
$nickname = $channel['channel_address'];
+
+ $uid = (($a->profile['profile_uid']) ? $a->profile['profile_uid'] : local_user());
if(x($_GET,'tab'))
$tab = notags(trim($_GET['tab']));
@@ -1489,7 +1491,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
),
);
- $p = get_all_perms($a->profile['profile_uid'],get_observer_hash());
+ $p = get_all_perms($uid,get_observer_hash());
if($p['view_profile']) {
$tabs[] = array(
@@ -1550,7 +1552,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
}
- if($is_owner && feature_enabled($a->profile['profile_uid'],'webpages')) {
+ if($is_owner && feature_enabled($uid,'webpages')) {
$tabs[] = array(
'label' => t('Webpages'),
'url' => $a->get_baseurl() . '/webpages/' . $nickname,
diff --git a/include/reddav.php b/include/reddav.php
index b7bb94fa0..7c14ca472 100644
--- a/include/reddav.php
+++ b/include/reddav.php
@@ -884,8 +884,12 @@ class RedBrowser extends DAV\Browser\Plugin {
date_default_timezone_set($this->auth->timezone);
$version = '';
+ require_once('include/conversation.php');
- $html = "
+ if($this->auth->channel_name)
+ $html = profile_tabs(get_app(),(($this->auth->channel_id == local_user()) ? true : false),$this->auth->channel_name);
+
+ $html .= "
<body>
<h1>Index for " . $this->escapeHTML($path) . "/</h1>
<table>