aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-10 16:06:09 -0700
committerzotlabs <mike@macgirvin.com>2017-10-10 16:06:09 -0700
commit4203d43c58044582fdab9e46cddef7e7fa7b23fa (patch)
tree66bb85a48115c85ac2b60b199047325aef2ab5b1 /Zotlabs
parent6a2c5e07310e723d020e4b6d4123181db5c805db (diff)
parent07ae4319501ac6edc024a849b4d060f171f27178 (diff)
downloadvolse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.tar.gz
volse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.tar.bz2
volse-hubzilla-4203d43c58044582fdab9e46cddef7e7fa7b23fa.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel.php7
-rw-r--r--Zotlabs/Widget/Notifications.php4
2 files changed, 2 insertions, 9 deletions
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 508d2b57a..14d02d873 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -92,11 +92,6 @@ class Channel extends \Zotlabs\Web\Controller {
// Ensure we've got a profile owner if updating.
\App::$profile['profile_uid'] = \App::$profile_uid = $update;
}
- else {
- if(\App::$profile['profile_uid'] == local_channel()) {
- nav_set_selected('Channel Home');
- }
- }
$is_owner = (((local_channel()) && (\App::$profile['profile_uid'] == local_channel())) ? true : false);
@@ -119,6 +114,8 @@ class Channel extends \Zotlabs\Web\Controller {
if(! $update) {
+ nav_set_selected('Channel Home');
+
$static = channel_manual_conv_update(\App::$profile['profile_uid']);
//$o .= profile_tabs($a, $is_owner, \App::$profile['channel_address']);
diff --git a/Zotlabs/Widget/Notifications.php b/Zotlabs/Widget/Notifications.php
index cac884cd1..0f82d102e 100644
--- a/Zotlabs/Widget/Notifications.php
+++ b/Zotlabs/Widget/Notifications.php
@@ -6,9 +6,6 @@ class Notifications {
function widget($arr) {
- if(! get_pconfig(local_channel(), 'system', 'experimental_notif'))
- return;
-
$channel = \App::get_channel();
if(local_channel()) {
@@ -139,7 +136,6 @@ class Notifications {
]
];
-
$o = replace_macros(get_markup_template('notifications_widget.tpl'), array(
'$notifications' => $notifications,
'$loading' => t('Loading...')