[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX][UI] UAB: avoid duplicate admin dashboard preference search results
"Jonny Bradley \(@jonnybradley\) via TikiWiki-cvs" <[email protected]> Mon, 06 Jul 2026 14:19:28 +0000
| Newsgroups | gmane.comp.cms.tiki.cvs |
|---|---|
| Message-ID | <6a4bb970b2b47_3819a8c09354b@gitlab-sidekiq-low-urgency-cpu-bound-v2-757cb76464-nkxzq.mail> |
Jonny Bradley pushed to branch master at Tiki Wiki CMS Groupware / Tiki
Commits:
113a51c7 by MAGENE Sem Joel at 2026-07-06T14:00:27+00:00
[FIX][UI] UAB: avoid duplicate admin dashboard preference search results
---
* [FIX][UI] UAB: avoid duplicate admin dashboard preference search results
See merge request tikiwiki/tiki!10644
- - - - -
1 changed file:
- templates/tiki-admin.tpl
Changes:
=====================================
templates/tiki-admin.tpl
=====================================
@@ -1,5 +1,5 @@
-{assign var=adminLayoutChrome value=($prefs.theme_unified_admin_backend eq 'y' && $prefs.site_layout eq 'admin')}
-{if !$adminLayoutChrome}
+{assign var=sharedAdminLayout value=($prefs.theme_unified_admin_backend eq 'y' && (($prefs.site_layout_admin|default:$prefs.site_layout) eq 'admin'))}
+{if !$sharedAdminLayout}
<div class="admin-wrapper highlightable{* {if $prefs.theme_unified_admin_backend eq 'y'} overflow-auto{/if} *}">
{if $prefs.theme_unified_admin_backend eq 'y'}
<aside class="admin-nav">
@@ -337,7 +337,7 @@
{/if}
{include file="admin/include_$include.tpl"}
{/if}
-{if !$adminLayoutChrome}
+{if !$sharedAdminLayout}
</div>
</div>
{/if}
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/113a51c7c6cdd997221b150f6f0d5a4168eae0c3
--
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/113a51c7c6cdd997221b150f6f0d5a4168eae0c3
You're receiving this email because of your account on gitlab.com. Manage all notifications: https://gitlab.com/-/profile/notifications | Help: https://gitlab.com/help
_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs