From 6a7fbd01a417751eed687561c7880c71b394a010 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Tue, 30 Jan 2024 13:10:28 +0000
Subject: [PATCH] fixes #3686
Closes #3686
Merge request studip/studip!2562
---
app/controllers/jsupdater.php | 6 +++---
app/views/admin/plugin/manifest.php | 4 ++--
lib/models/WikiPage.class.php | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/controllers/jsupdater.php b/app/controllers/jsupdater.php
index 70bf86e9820..eb6032d9df0 100644
--- a/app/controllers/jsupdater.php
+++ b/app/controllers/jsupdater.php
@@ -247,10 +247,10 @@ class JsupdaterController extends AuthenticatedController
Questionnaire::findEachMany(
function (Questionnaire $questionnaire) use ($pageInfo, &$data) {
if ($questionnaire->latestAnswerTimestamp() > $pageInfo['questionnaire']['last_update']) {
- $template = $this->get_template_factory()->open("questionnaire/evaluate");
- $template->filtered = $pageInfo['questionnaire']['filtered'];
+ $template = $this->get_template_factory()->open('questionnaire/evaluate');
+ $template->questionnaire = $questionnaire;
+ $template->filtered = $pageInfo['questionnaire']['filtered'] ?? [];
$template->set_layout(null);
- $template->set_attribute("questionnaire", $questionnaire);
$data[$questionnaire->id] = [
'html' => $template->render()
];
diff --git a/app/views/admin/plugin/manifest.php b/app/views/admin/plugin/manifest.php
index 17d9bae2584..8f61111c7bd 100644
--- a/app/views/admin/plugin/manifest.php
+++ b/app/views/admin/plugin/manifest.php
@@ -15,10 +15,10 @@
<dd><?= join(', ', $plugin['type']) ?></dd>
<dt><?= _('Origin') ?></dt>
- <dd><?= htmlReady($manifest['origin']) ?></dd>
+ <dd><?= htmlReady($manifest['origin'] ?? '?') ?></dd>
<dt><?= _('Version') ?></dt>
- <dd><?= htmlReady($manifest['version']) ?></dd>
+ <dd><?= htmlReady($manifest['version'] ?? '?') ?></dd>
<dt><?= _('Beschreibung') ?></dt>
<dd>
diff --git a/lib/models/WikiPage.class.php b/lib/models/WikiPage.class.php
index 3011a26595c..d349aa1ec89 100644
--- a/lib/models/WikiPage.class.php
+++ b/lib/models/WikiPage.class.php
@@ -141,7 +141,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
) {
return true;
}
- if ($user_id === null) {
+ if ($user_id === null && User::findCurrent()) {
$user_id = User::findCurrent()->id;
}
@@ -174,7 +174,7 @@ class WikiPage extends SimpleORMap implements PrivacyObject
*/
public function isEditable(?string $user_id = null): bool
{
- if ($user_id === null) {
+ if ($user_id === null && User::findCurrent()) {
$user_id = User::findCurrent()->id;
}
if ($GLOBALS['perm']->have_studip_perm(
--
GitLab