From 08dcf3c21b0f6d07cccce5052d29470797be2e5c Mon Sep 17 00:00:00 2001 From: David Siegfried Date: Fri, 4 Oct 2024 06:30:19 +0000 Subject: prevent php-warnings in questionnaire and my_courses, fixes #4665 Closes #4665 Merge request studip/studip!3476 --- app/controllers/file.php | 2 +- app/controllers/my_courses.php | 1 + app/views/questionnaire/question_types/vote/vote_evaluation.php | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/file.php b/app/controllers/file.php index 376a74e..ddcef2c 100644 --- a/app/controllers/file.php +++ b/app/controllers/file.php @@ -1473,7 +1473,7 @@ class FileController extends AuthenticatedController } $payload = [ 'html' => FilesystemVueDataManager::getFileVueData($newfile, $this->current_folder), - 'redirect' => $redirects[0], + 'redirect' => $redirects[0] ?? '', 'url' => $this->generateFilesUrl($this->current_folder, $newfile), ]; diff --git a/app/controllers/my_courses.php b/app/controllers/my_courses.php index d856ad4..187d6c6 100644 --- a/app/controllers/my_courses.php +++ b/app/controllers/my_courses.php @@ -475,6 +475,7 @@ class MyCoursesController extends AuthenticatedController )); } } else { + $prio_delete = false; // LOGGING StudipLog::log('SEM_USER_DEL', $course_id, $GLOBALS['user']->id, 'Hat sich selbst aus der Warteliste ausgetragen'); if ($course->isAdmissionEnabled()) { diff --git a/app/views/questionnaire/question_types/vote/vote_evaluation.php b/app/views/questionnaire/question_types/vote/vote_evaluation.php index bd6ce85..b78ddc8 100644 --- a/app/views/questionnaire/question_types/vote/vote_evaluation.php +++ b/app/views/questionnaire/question_types/vote/vote_evaluation.php @@ -83,7 +83,12 @@ rsort($ordered_results); - questionnaire->countAnswers() ?> + questionnaire) { + $countAnswers = $vote->questionnaire->countAnswers(); + } + ?> $answer) : ?> -- cgit v1.0