Skip to content
Snippets Groups Projects
Commit 04736fad authored by André Noack's avatar André Noack
Browse files

Resolve "Personenverwaltung: Hochstufen zu admin/root läuft in Fehler"

Closes #3752

Merge request studip/studip!2621
parent 59f9ac49
No related branches found
No related tags found
No related merge requests found
......@@ -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') {
......
......@@ -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;
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment