diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-10 16:05:56 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-10 16:05:56 -0700 |
| commit | f273815d8ff45a28b36bd5121c58422dfc28d0ff (patch) | |
| tree | f51f4dbfe646b41c1016c85589701cdc44db40e7 /Zotlabs | |
| parent | 87970491441cb15462d3fe7a7641d2f2755cb45b (diff) | |
| parent | 07ae4319501ac6edc024a849b4d060f171f27178 (diff) | |
| download | volse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.tar.gz volse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.tar.bz2 volse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Channel.php | 7 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 3 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notifications.php | 4 |
3 files changed, 5 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/Render/Comanche.php b/Zotlabs/Render/Comanche.php index ca664cba6..c787b19ae 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -457,6 +457,9 @@ class Comanche { } } + if(! purify_filename($name)) + return ''; + $clsname = ucfirst($name); $nsname = "\\Zotlabs\\Widget\\" . $clsname; 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...') |