aboutsummaryrefslogtreecommitdiff
path: root/app/controllers/settings
diff options
context:
space:
mode:
authorMoritz Strohm <strohm@data-quest.de>2022-07-04 10:14:49 +0000
committerMoritz Strohm <strohm@data-quest.de>2022-07-04 10:14:49 +0000
commit0b867f0e61bfdcacd3339bcfadaf585f7bbba716 (patch)
treef5d081243c5a44b9c170124ceab3c76df032bf99 /app/controllers/settings
parent5e8d267f10b5ae3b2a2d9bd82eb6ed44885950bd (diff)
fix for BIESt #1078
Merge request studip/studip!657
Diffstat (limited to 'app/controllers/settings')
-rw-r--r--app/controllers/settings/details.php1
-rw-r--r--app/controllers/settings/messaging.php11
2 files changed, 11 insertions, 1 deletions
diff --git a/app/controllers/settings/details.php b/app/controllers/settings/details.php
index 5f6f738..956f844 100644
--- a/app/controllers/settings/details.php
+++ b/app/controllers/settings/details.php
@@ -53,7 +53,6 @@ class Settings_DetailsController extends Settings_SettingsController
: false;
$this->is_dozent = $this->user->perms == 'dozent';
$this->user_entries = $userEntries;
- $this->invalid_entries = $invalidEntries;
}
/**
diff --git a/app/controllers/settings/messaging.php b/app/controllers/settings/messaging.php
index 4c249af..23e6d79 100644
--- a/app/controllers/settings/messaging.php
+++ b/app/controllers/settings/messaging.php
@@ -26,6 +26,17 @@ class Settings_MessagingController extends Settings_SettingsController
Navigation::activateItem('/profile/settings/messaging');
$this->settings = $this->config->MESSAGING_SETTINGS;
+ $all_settings_fields = [
+ 'save_snd',
+ 'request_mail_forward',
+ 'show_adressees',
+ 'logout_markreaded'
+ ];
+ foreach ($all_settings_fields as $field) {
+ if (!array_key_exists($field, $this->settings)) {
+ $this->settings[$field] = 0;
+ }
+ }
}
public function index_action()