[TikiWiki-commits] [Git][tikiwiki/tiki][30.x] [BP][FIX][UI] UAB: avoid duplicate admin dashboard preference search results

MAGENE Sem Joel pushed to branch 30.x at Tiki Wiki CMS Groupware / Tiki


Commits:
4218195a by MAGENE Sem Joel at 2026-07-06T14:39:52+00:00
[BP][FIX][UI] UAB: avoid duplicate admin dashboard preference search results
---
* [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

(cherry picked from commit 113a51c7c6cdd997221b150f6f0d5a4168eae0c3)

See merge request tikiwiki/tiki!10657

- - - - -


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/4218195aa29df52a26d36b7492759476aff6f0c3

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4218195aa29df52a26d36b7492759476aff6f0c3
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