Fix duplicate id "hole"

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/core/src/components/MainMenu.js b/core/src/components/MainMenu.js
index 436fd835cc311fa32b8c3376ebb1940b063f7b9e..603338d05b35651c68ec57a11be4506d22e7e220 100644 (file)
--- a/core/src/components/MainMenu.js
+++ b/core/src/components/MainMenu.js
@@ -45,8 +45,8 @@ export const setUp = () => {
                        } else {
                                appmenuElement.classList.add('has-unread')
                                appsElement.classList.add('has-unread')
-                               appmenuElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)'
-                               appsElement.getElementsByTagName('image')[0].style.mask = 'url(#hole)'
+                               appmenuElement.getElementsByTagName('image')[0].style.mask = 'url(#hole-appmenu-' + id + ')'
+                               appsElement.getElementsByTagName('image')[0].style.mask = 'url(#hole-' + id + ')'
                        }
                        document.getElementById('appmenu').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter
                        document.getElementById('apps').querySelector('[data-id="' + id + '"] .unread-counter').textContent = counter

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index eafca3da1bdeb5a6c71500c6aab7756b5d593606..337a1dfc3178520386db7eee6b56d5e7f0062e0b 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -73,9 +73,9 @@ $getUserAvatar = static function (int $size) use ($_): string {
                                                                <?php if (isset($entry['target']) && $entry['target']): ?> target="_blank" rel="noreferrer noopener"<?php endif; ?>
                                                                <?php if ($entry['active']): ?> class="active"<?php endif; ?>
                                                                aria-label="<?php p($entry['name']); ?>">
-                                                                       <svg width="24" height="20" viewBox="0 0 24 20" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
+                                                                       <svg width="24" height="20" viewBox="0 0 24 20"<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
                                                                                <defs>
-                                                                                       <mask id="hole">
+                                                                                       <mask id="hole-appmenu-<?php p($entry['id']); ?>">
                                                                                                <rect width="100%" height="100%" fill="white"/>
                                                                                                <circle r="4.5" cx="21" cy="3" fill="black"/>
                                                                                        </mask>
@@ -109,10 +109,10 @@ $getUserAvatar = static function (int $size) use ($_): string {
                                                                                <?php if (isset($entry['target']) && $entry['target']): ?> target="_blank" rel="noreferrer noopener"<?php endif; ?>
                                                                                <?php if ($entry['active']): ?> class="active"<?php endif; ?>
                                                                                aria-label="<?php p($entry['name']); ?>">
-                                                                               <svg width="20" height="20" viewBox="0 0 16 16" alt=""<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
+                                                                               <svg width="20" height="20" viewBox="0 0 16 16"<?php if ($entry['unread'] !== 0) { ?> class="has-unread"<?php } ?>>
                                                                                        <defs>
                                                                                                <filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter>
-                                                                                               <mask id="hole">
+                                                                                               <mask id="hole-<?php p($entry['id']); ?>">
                                                                                                        <rect width="100%" height="100%" fill="white"/>
                                                                                                        <circle r="4.5" cx="17" cy="3" fill="black"/>
                                                                                                </mask>