From 34b1c2809bd2c34a42d45685e1b9a5676e8f494f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 11 Jan 2022 20:20:44 +0100
Subject: [PATCH] fix issue with custom categories and add experimental notice

---
 lib/Service/AppRepository.php     | 2 +-
 templates/settings/admin-form.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Service/AppRepository.php b/lib/Service/AppRepository.php
index d1ba8d8..d91ec75 100644
--- a/lib/Service/AppRepository.php
+++ b/lib/Service/AppRepository.php
@@ -95,7 +95,7 @@ class AppRepository
         }
 
         foreach ($visibleApps as $id => $app) {
-            if (isset($appCategoriesCustom[$id]) && (isset($categoriesCustom[$id]) || isset($categories[$id]))) {
+            if (isset($appCategoriesCustom[$id], $categories[$appCategoriesCustom[$id]])) {
                 $visibleApps[$id]['category'] = [$appCategoriesCustom[$id]];
             }
         }
diff --git a/templates/settings/admin-form.php b/templates/settings/admin-form.php
index 00b5cc6..e75fc2b 100644
--- a/templates/settings/admin-form.php
+++ b/templates/settings/admin-form.php
@@ -497,7 +497,6 @@ $choicesSizes = [
         <div>
             <label for="side-menu-opener">
                 <?php p($l->t('Always displayed')); ?>
-                <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
             </label>
         </div>
         <p><em><?php p($l->t('Not compatible with touch screens.')); ?></em></p>
@@ -805,6 +804,7 @@ $choicesSizes = [
             <div class="side-menu-setting-row">
                 <div class="side-menu-setting-label">
                     <?php p($l->t('Customize application categories')); ?>
+                    <small><span class="warning"><?php p($l->t('Experimental')); ?></span></small>
                 </div>
                 <div class="side-menu-setting-form">
                     <a class="side-menu-toggler" data-target="#apps-categories-custom-list" href="#_">