incorrect namespace

This commit is contained in:
nobody 2022-03-16 22:14:45 -07:00
parent 774406dca8
commit eff0b62be7
4 changed files with 7 additions and 12 deletions

View file

@ -78,7 +78,7 @@ class AccessList
$user_info = array_shift($r);
$change = false;
if ($user_info['channel_default_group'] == $group_hash) {
if ($user_info['channel_default_group'] === $group_hash) {
$user_info['channel_default_group'] = '';
$change = true;
}
@ -95,7 +95,7 @@ class AccessList
q(
"UPDATE channel SET channel_default_group = '%s', channel_allow_gid = '%s', channel_deny_gid = '%s'
WHERE channel_id = %d",
intval($user_info['channel_default_group']),
dbesc($user_info['channel_default_group']),
dbesc($user_info['channel_allow_gid']),
dbesc($user_info['channel_deny_gid']),
intval($uid)

View file

@ -73,11 +73,7 @@ class Navbar {
$site_icon = System::get_site_icon();
$banner = EMPTY_STR;
// $banner = System::get_site_name();
// if (! isset(App::$page['header'])) {
// App::$page['header'] = EMPTY_STR;
// }
App::$page['header'] .= replace_macros(Theme::get_template('hdr.tpl'), array(
//we could additionally use this to display important system notifications e.g. for updates
));

View file

@ -135,7 +135,7 @@ function collect_recipients($item, &$private_envelope,$include_groups = true) {
// We've determined this is public. Send it also to the system channel.
$sys = get_sys_channel();
$sys = Channel::get_system();
if ($sys && intval($item['uid']) !== intval($sys['channel_id'])) {
$recipients[] = $sys['channel_hash'];
}

View file

@ -27,6 +27,9 @@
{{foreach $nav.usermenu as $usermenu}}
<a class="dropdown-item{{if $usermenu.2}} active{{/if}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem" id="{{$usermenu.4}}">{{$usermenu.1}}</a>
{{/foreach}}
{{if $nav.settings}}
<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
{{/if}}
{{if $nav.group}}
<a class="dropdown-item" href="{{$nav.group.0}}" title="{{$nav.group.3}}" role="menuitem" id="{{$nav.group.4}}">{{$nav.group.1}}</a>
{{/if}}
@ -41,10 +44,6 @@
{{if $nav.profiles}}
<a class="dropdown-item" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem" id="{{$nav.profiles.4}}">{{$nav.profiles.1}}</a>
{{/if}}
{{if $nav.settings}}
<div class="dropdown-divider"></div>
<a class="dropdown-item{{if $sel.name == Settings}} active{{/if}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem" id="{{$nav.settings.4}}">{{$nav.settings.1}}</a>
{{/if}}
{{if $nav.safe}}
<div class="dropdown-divider"></div>
<a class="dropdown-item{{if $sel.name == Safe}} active{{/if}}" href="{{$nav.safe.0}}" title="{{$nav.safe.3}}" role="menuitem" id="{{$nav.safe.4}}">{{$nav.safe.1}} {{$nav.safe.2}}</a>