aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-11 20:44:43 -0800
committerfriendica <info@friendica.com>2014-11-11 20:44:43 -0800
commit4b9ec6645b79f4da1ad5e7dd20a04ca6ca4a3e4a (patch)
tree1f686a039ba61701513aef5b59b03edeb317b97d /include
parentb5af6679857eeafcb360d7dec69acf11af034c1d (diff)
downloadvolse-hubzilla-4b9ec6645b79f4da1ad5e7dd20a04ca6ca4a3e4a.tar.gz
volse-hubzilla-4b9ec6645b79f4da1ad5e7dd20a04ca6ca4a3e4a.tar.bz2
volse-hubzilla-4b9ec6645b79f4da1ad5e7dd20a04ca6ca4a3e4a.zip
cleanup
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php8
-rw-r--r--include/text.php3
2 files changed, 9 insertions, 2 deletions
diff --git a/include/conversation.php b/include/conversation.php
index a531de9ba..c2258c20a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1493,8 +1493,12 @@ function network_tabs() {
function profile_tabs($a, $is_owner=False, $nickname=Null){
- //echo "<pre>"; var_dump($a->user); killme();
-
+
+ // Don't provide any profile tabs if we're running as the sys channel
+
+ if($a->is_sys)
+ return;
+
$channel = $a->get_channel();
if (is_null($nickname))
diff --git a/include/text.php b/include/text.php
index 686dee4a2..d816fdb0a 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2023,10 +2023,12 @@ function json_decode_plus($s) {
function design_tools() {
$channel = get_app()->get_channel();
+ $sys = false;
if(get_app()->is_sys && is_site_admin()) {
require_once('include/identity.php');
$channel = get_sys_channel();
+ $sys = true;
}
$who = $channel['channel_address'];
@@ -2034,6 +2036,7 @@ function design_tools() {
return replace_macros(get_markup_template('design_tools.tpl'), array(
'$title' => t('Design'),
'$who' => $who,
+ '$sys' => $sys,
'$blocks' => t('Blocks'),
'$menus' => t('Menus'),
'$layout' => t('Layouts'),