diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index de555ac6dc2..220660a44a3 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -66,7 +66,7 @@
'return_type_declaration' => true,
'static_lambda' => true,
- 'fully_qualified_strict_types' => true,
+ 'fully_qualified_strict_types' => ['leading_backslash_in_global_namespace' => true],
'no_leading_import_slash' => true,
'no_unused_imports' => true,
'ordered_imports' => true,
diff --git a/XSD/acpMenu.xsd b/XSD/acpMenu.xsd
index efcc4cea79d..da96c7b1de1 100644
--- a/XSD/acpMenu.xsd
+++ b/XSD/acpMenu.xsd
@@ -34,7 +34,11 @@
-
+
+
+
+
+
@@ -53,4 +57,4 @@
-
\ No newline at end of file
+
diff --git a/XSD/bbcode.xsd b/XSD/bbcode.xsd
index a6e1015f937..724730dd5c3 100644
--- a/XSD/bbcode.xsd
+++ b/XSD/bbcode.xsd
@@ -34,7 +34,11 @@
-
+
+
+
+
+
@@ -57,7 +61,7 @@
-
+
@@ -77,4 +81,4 @@
-
\ No newline at end of file
+
diff --git a/XSD/cronjob.xsd b/XSD/cronjob.xsd
index 6bc26a4279c..62cbe75737a 100644
--- a/XSD/cronjob.xsd
+++ b/XSD/cronjob.xsd
@@ -1,5 +1,5 @@
-
+
@@ -30,27 +30,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
@@ -60,4 +56,12 @@
+
+
+
+
+
+
+
+
diff --git a/XSD/language.xsd b/XSD/language.xsd
index 9c5e933f88c..77955ad9d3a 100644
--- a/XSD/language.xsd
+++ b/XSD/language.xsd
@@ -7,13 +7,17 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -46,4 +50,4 @@
-
\ No newline at end of file
+
diff --git a/XSD/objectType.xsd b/XSD/objectType.xsd
index ac284115057..9daa1e07d60 100644
--- a/XSD/objectType.xsd
+++ b/XSD/objectType.xsd
@@ -43,15 +43,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
\ No newline at end of file
+
diff --git a/XSD/option.xsd b/XSD/option.xsd
index a83b4814ac7..4b4d26d658e 100644
--- a/XSD/option.xsd
+++ b/XSD/option.xsd
@@ -72,6 +72,11 @@
+
+
+
+
+
diff --git a/XSD/packageUpdateServer.xsd b/XSD/packageUpdateServer.xsd
index e5b47e54f17..0bd25aac2a3 100644
--- a/XSD/packageUpdateServer.xsd
+++ b/XSD/packageUpdateServer.xsd
@@ -83,9 +83,8 @@
-
-
+
diff --git a/XSD/userGroupOption.xsd b/XSD/userGroupOption.xsd
index 57b2e8b2891..1fc6cd649f4 100644
--- a/XSD/userGroupOption.xsd
+++ b/XSD/userGroupOption.xsd
@@ -71,9 +71,11 @@
+
+
-
\ No newline at end of file
+
diff --git a/XSD/userMenu.xsd b/XSD/userMenu.xsd
index 30bf104066b..7b442f7bf54 100644
--- a/XSD/userMenu.xsd
+++ b/XSD/userMenu.xsd
@@ -34,7 +34,11 @@
-
+
+
+
+
+
@@ -53,4 +57,4 @@
-
\ No newline at end of file
+
diff --git a/XSD/userOption.xsd b/XSD/userOption.xsd
index 846001059fd..4e805d33ff3 100644
--- a/XSD/userOption.xsd
+++ b/XSD/userOption.xsd
@@ -88,6 +88,8 @@
+
+
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 19becd03b10..a7da6fd21c0 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
Free CMS and web-framework, designed for awesome websites and communities.
Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.
1
- 6.0.6
- 2024-01-01
+ 6.0.10
+ 2024-02-22
@@ -50,7 +50,7 @@
acp/install_com.woltlab.wcf_step2.php
-
+
files_update.tar
diff --git a/com.woltlab.wcf/templates/__menu.tpl b/com.woltlab.wcf/templates/__menu.tpl
index b82a58d2349..a5d2b70b026 100644
--- a/com.woltlab.wcf/templates/__menu.tpl
+++ b/com.woltlab.wcf/templates/__menu.tpl
@@ -9,7 +9,7 @@
{if $menuItemNode->getOutstandingItems() > 0}
{#$menuItemNode->getOutstandingItems()}
{/if}
- {if $menuItemNode->hasChildren()}
+ {if $menuIdentifier == 'com.woltlab.wcf.MainMenu' && $menuItemNode->hasChildren() && $menuItemNode->getDepth() == 1}
{icon name='caret-down' type='solid'}
{/if}
diff --git a/com.woltlab.wcf/templates/email_dailyNotification.tpl b/com.woltlab.wcf/templates/email_dailyNotification.tpl
index f452bf9aefe..4c42bc1e697 100644
--- a/com.woltlab.wcf/templates/email_dailyNotification.tpl
+++ b/com.woltlab.wcf/templates/email_dailyNotification.tpl
@@ -1,3 +1,7 @@
+{* variable definition for full backwards-compatibility *}
+{if !$notificationCount|isset}{assign var=notificationCount value=$notifications|count}{/if}
+{if !$maximum|isset}{assign var=maximum value=$notificationCount}{/if}
+{if !$remaining|isset}{assign var=remaining value=0}{/if}
{if $mimeType === 'text/plain'}
{capture assign='content'}
{lang}wcf.user.notification.mail.daily.plaintext.intro{/lang}
diff --git a/com.woltlab.wcf/templates/messageOptionType.tpl b/com.woltlab.wcf/templates/messageOptionType.tpl
index c176a4ea42b..3647f324626 100644
--- a/com.woltlab.wcf/templates/messageOptionType.tpl
+++ b/com.woltlab.wcf/templates/messageOptionType.tpl
@@ -1,4 +1,4 @@
-
+
{include file='shared_wysiwyg' wysiwygSelector=$option->optionName}