diff options
| author | André Noack <noack@data-quest.de> | 2024-02-27 12:00:02 +0000 |
|---|---|---|
| committer | André Noack <noack@data-quest.de> | 2024-02-27 12:00:02 +0000 |
| commit | 04736fadb0cf33239ed879a3231315f50a1862b8 (patch) | |
| tree | bdf43b93e72be8d7f162ae3d5d7b6103991ad344 | |
| parent | 59f9ac49944b62a584a2c941a41840ce04722d16 (diff) | |
Resolve "Personenverwaltung: Hochstufen zu admin/root läuft in Fehler"
Closes #3752
Merge request studip/studip!2621
| -rw-r--r-- | lib/classes/UserManagement.class.php | 4 | ||||
| -rw-r--r-- | lib/classes/auth_plugins/StudipAuthAbstract.class.php | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php index 7dd38ea..3efae35 100644 --- a/lib/classes/UserManagement.class.php +++ b/lib/classes/UserManagement.class.php @@ -585,10 +585,6 @@ class UserManagement if ($count = UserStudyCourse::deleteBySQL('user_id = ?', [$this->user_data['auth_user_md5.user_id']])) { $this->msg .= 'info§' . sprintf(_('%s Zuordnungen zu Studiengängen gelöscht.'), $count) . '§'; } - // delete all private appointments of this user - if ($count = delete_range_of_dates($this->user_data['auth_user_md5.user_id'], false)) { - $this->msg .= 'info§' . sprintf(_('%s Einträge aus den Terminen gelöscht.'), $count) . '§'; - } } if ($newuser['auth_user_md5.perms'] === 'admin') { diff --git a/lib/classes/auth_plugins/StudipAuthAbstract.class.php b/lib/classes/auth_plugins/StudipAuthAbstract.class.php index fd2d4e9..36c75df 100644 --- a/lib/classes/auth_plugins/StudipAuthAbstract.class.php +++ b/lib/classes/auth_plugins/StudipAuthAbstract.class.php @@ -125,7 +125,7 @@ class StudipAuthAbstract self::$plugin_instances[strtoupper($plugin)] = new $plugin_class($config); } } - return ($plugin_name) ? self::$plugin_instances[strtoupper($plugin_name)] : self::$plugin_instances; + return ($plugin_name) ? self::$plugin_instances[strtoupper($plugin_name)]??null : self::$plugin_instances; } /** |