From c75fbf8a83e567e6a1789bab35e7bc6f7eabaeaf Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 5 Jan 2024 09:45:50 +0100
Subject: Add data-active-section-type attribute to app-content settings
 section

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 apps/settings/templates/settings/frame.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/settings/templates')

diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
index b0889746173..fac4753eeaf 100644
--- a/apps/settings/templates/settings/frame.php
+++ b/apps/settings/templates/settings/frame.php
@@ -84,6 +84,6 @@ script('files', 'jquery.fileupload');
 		</ul>
 	</nav>
 </div>
-<div id="app-content" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>">
+<div id="app-content" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>">
 	<?php print_unescaped($_['content']); ?>
 </div>
-- 
cgit v1.2.3


From 0d39079c99d9ae0fbe019b1ffad5fbdbe3bc06f5 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Fri, 5 Jan 2024 10:06:28 +0100
Subject: fix(settings): check if activeSectionId and activeSectionType are
 defined before using them

Closes #41513

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 apps/settings/templates/settings/frame.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apps/settings/templates')

diff --git a/apps/settings/templates/settings/frame.php b/apps/settings/templates/settings/frame.php
index fac4753eeaf..9b9bab8c283 100644
--- a/apps/settings/templates/settings/frame.php
+++ b/apps/settings/templates/settings/frame.php
@@ -84,6 +84,6 @@ script('files', 'jquery.fileupload');
 		</ul>
 	</nav>
 </div>
-<div id="app-content" data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>">
+<div id="app-content" <?php if (!empty($_['activeSectionId'])) { ?> data-active-section-id="<?php print_unescaped($_['activeSectionId']) ?>" <?php } if (!empty($_['activeSectionType'])) { ?> data-active-section-type="<?php print_unescaped($_['activeSectionType']) ?>" <?php } ?>>
 	<?php print_unescaped($_['content']); ?>
 </div>
-- 
cgit v1.2.3