Skip to content
Snippets Groups Projects
Commit 08dcf3c2 authored by David Siegfried's avatar David Siegfried Committed by Jan-Hendrik Willms
Browse files

prevent php-warnings in questionnaire and my_courses, fixes #4665

Closes #4665

Merge request studip/studip!3476
parent 76ed0b81
Branches
No related tags found
No related merge requests found
...@@ -1473,7 +1473,7 @@ class FileController extends AuthenticatedController ...@@ -1473,7 +1473,7 @@ class FileController extends AuthenticatedController
} }
$payload = [ $payload = [
'html' => FilesystemVueDataManager::getFileVueData($newfile, $this->current_folder), 'html' => FilesystemVueDataManager::getFileVueData($newfile, $this->current_folder),
'redirect' => $redirects[0], 'redirect' => $redirects[0] ?? '',
'url' => $this->generateFilesUrl($this->current_folder, $newfile), 'url' => $this->generateFilesUrl($this->current_folder, $newfile),
]; ];
......
...@@ -475,6 +475,7 @@ class MyCoursesController extends AuthenticatedController ...@@ -475,6 +475,7 @@ class MyCoursesController extends AuthenticatedController
)); ));
} }
} else { } else {
$prio_delete = false;
// LOGGING // LOGGING
StudipLog::log('SEM_USER_DEL', $course_id, $GLOBALS['user']->id, 'Hat sich selbst aus der Warteliste ausgetragen'); StudipLog::log('SEM_USER_DEL', $course_id, $GLOBALS['user']->id, 'Hat sich selbst aus der Warteliste ausgetragen');
if ($course->isAdmissionEnabled()) { if ($course->isAdmissionEnabled()) {
......
...@@ -83,7 +83,12 @@ rsort($ordered_results); ...@@ -83,7 +83,12 @@ rsort($ordered_results);
<table class="default nohover"> <table class="default nohover">
<tbody> <tbody>
<? $countAnswers = $vote->questionnaire->countAnswers() ?> <?php
$countAnswers = 0;
if ($vote->questionnaire) {
$countAnswers = $vote->questionnaire->countAnswers();
}
?>
<? foreach ($options as $key => $answer) : ?> <? foreach ($options as $key => $answer) : ?>
<tr> <tr>
<? $percentage = ($countAnswers && isset($results[$key])) ? round((int) $results[$key] / $countAnswers * 100) : 0 ?> <? $percentage = ($countAnswers && isset($results[$key])) ? round((int) $results[$key] / $countAnswers * 100) : 0 ?>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment