From 04736fadb0cf33239ed879a3231315f50a1862b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Noack?= <noack@data-quest.de>
Date: Tue, 27 Feb 2024 12:00:02 +0000
Subject: [PATCH] =?UTF-8?q?Resolve=20"Personenverwaltung:=20Hochstufen=20z?=
=?UTF-8?q?u=20admin/root=20l=C3=A4uft=20in=20Fehler"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Closes #3752
Merge request studip/studip!2621
---
lib/classes/UserManagement.class.php | 4 ----
lib/classes/auth_plugins/StudipAuthAbstract.class.php | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/classes/UserManagement.class.php b/lib/classes/UserManagement.class.php
index 7dd38eaa570..3efae350047 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 fd2d4e9aaff..36c75df646f 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;
}
/**
--
GitLab