diff options
| author | Rasmus Fuhse <fuhse@data-quest.de> | 2025-07-10 08:32:09 +0000 |
|---|---|---|
| committer | Jan-Hendrik Willms <tleilax+studip@gmail.com> | 2025-07-11 09:57:01 +0200 |
| commit | 667f1baeed196cd90731cbe53cbb6e386b5d1f1f (patch) | |
| tree | f079a2948e19b078c2407ee1673bde9ff380a574 | |
| parent | 80171377a94b10a34fd0bd085c89b8b08ad269c5 (diff) | |
Resolve "Wiki: automatisches Speichern funktioniert nicht, wenn "Benachrichtigungen über Javascript" deaktivert ist"
Closes #4847, #4848, and #935
Merge request studip/studip!4337
| -rw-r--r-- | app/views/settings/general.php | 2 | ||||
| -rw-r--r-- | lib/include/html_head.inc.php | 3 | ||||
| -rw-r--r-- | templates/layouts/base.php | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/views/settings/general.php b/app/views/settings/general.php index 27cf5c9..0e7b7d1 100644 --- a/app/views/settings/general.php +++ b/app/views/settings/general.php @@ -77,7 +77,7 @@ $start_pages = [ <input type="checkbox" name="personal_notifications_activated" aria-describedby="personal_notifications_activated_description" value="1" <? if (PersonalNotifications::isActivated($user->user_id)) echo 'checked'; ?>> - <?= _('Benachrichtigungen über Javascript') ?> + <?= _('Benachrichtigungen über Neuigkeiten') ?> <?= tooltipIcon(_('Hiermit wird in der Kopfzeile dargestellt, wenn es Benachrichtigungen für ' .'Sie gibt. Die Benachrichtigungen werden auch angezeigt, wenn Sie nicht die ' .'Seite neuladen.')) ?> diff --git a/lib/include/html_head.inc.php b/lib/include/html_head.inc.php index 7e7bdea..c028ab2 100644 --- a/lib/include/html_head.inc.php +++ b/lib/include/html_head.inc.php @@ -48,8 +48,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); }, jsupdate_enable: <?= json_encode( is_object($GLOBALS['perm']) && - $GLOBALS['perm']->have_perm('autor') && - PersonalNotifications::isActivated()) ?>, + $GLOBALS['perm']->have_perm('autor')) ?>, wysiwyg_enabled: <?= json_encode((bool) Config::get()->WYSIWYG) ?> } </script> diff --git a/templates/layouts/base.php b/templates/layouts/base.php index 782a12b..67bda14 100644 --- a/templates/layouts/base.php +++ b/templates/layouts/base.php @@ -44,8 +44,7 @@ $lang_attr = str_replace('_', '-', $_SESSION['_language']); USER_ID: <?= json_encode($GLOBALS['user']->id) ?>, jsupdate_enable: <?= json_encode( is_object($GLOBALS['perm']) && - $GLOBALS['perm']->have_perm('autor') && - PersonalNotifications::isActivated()) ?>, + $GLOBALS['perm']->have_perm('autor')) ?>, wysiwyg_enabled: <?= json_encode((bool) Config::get()->WYSIWYG) ?>, server_timestamp: <?= time() ?>, config: <?= json_encode([ |