Skip to content
Snippets Groups Projects
Commit 6a7fbd01 authored by Jan-Hendrik Willms's avatar Jan-Hendrik Willms
Browse files

fixes #3686

Closes #3686

Merge request studip/studip!2562
parent 7f66cab7
No related branches found
No related tags found
No related merge requests found
...@@ -247,10 +247,10 @@ class JsupdaterController extends AuthenticatedController ...@@ -247,10 +247,10 @@ class JsupdaterController extends AuthenticatedController
Questionnaire::findEachMany( Questionnaire::findEachMany(
function (Questionnaire $questionnaire) use ($pageInfo, &$data) { function (Questionnaire $questionnaire) use ($pageInfo, &$data) {
if ($questionnaire->latestAnswerTimestamp() > $pageInfo['questionnaire']['last_update']) { if ($questionnaire->latestAnswerTimestamp() > $pageInfo['questionnaire']['last_update']) {
$template = $this->get_template_factory()->open("questionnaire/evaluate"); $template = $this->get_template_factory()->open('questionnaire/evaluate');
$template->filtered = $pageInfo['questionnaire']['filtered']; $template->questionnaire = $questionnaire;
$template->filtered = $pageInfo['questionnaire']['filtered'] ?? [];
$template->set_layout(null); $template->set_layout(null);
$template->set_attribute("questionnaire", $questionnaire);
$data[$questionnaire->id] = [ $data[$questionnaire->id] = [
'html' => $template->render() 'html' => $template->render()
]; ];
......
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<dd><?= join(', ', $plugin['type']) ?></dd> <dd><?= join(', ', $plugin['type']) ?></dd>
<dt><?= _('Origin') ?></dt> <dt><?= _('Origin') ?></dt>
<dd><?= htmlReady($manifest['origin']) ?></dd> <dd><?= htmlReady($manifest['origin'] ?? '?') ?></dd>
<dt><?= _('Version') ?></dt> <dt><?= _('Version') ?></dt>
<dd><?= htmlReady($manifest['version']) ?></dd> <dd><?= htmlReady($manifest['version'] ?? '?') ?></dd>
<dt><?= _('Beschreibung') ?></dt> <dt><?= _('Beschreibung') ?></dt>
<dd> <dd>
......
...@@ -141,7 +141,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject ...@@ -141,7 +141,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
) { ) {
return true; return true;
} }
if ($user_id === null) { if ($user_id === null && User::findCurrent()) {
$user_id = User::findCurrent()->id; $user_id = User::findCurrent()->id;
} }
...@@ -174,7 +174,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject ...@@ -174,7 +174,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
*/ */
public function isEditable(?string $user_id = null): bool public function isEditable(?string $user_id = null): bool
{ {
if ($user_id === null) { if ($user_id === null && User::findCurrent()) {
$user_id = User::findCurrent()->id; $user_id = User::findCurrent()->id;
} }
if ($GLOBALS['perm']->have_studip_perm( if ($GLOBALS['perm']->have_studip_perm(
......
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