From 4835e011afa6710146c32416544c73215a6c4ae5 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+studip@gmail.com>
Date: Mon, 17 Oct 2022 07:36:39 +0000
Subject: [PATCH] fix some warnings, fixes #1675
Closes #1675
Merge request studip/studip!1079
---
lib/classes/Avatar.class.php | 4 +++-
lib/classes/MyRealmModel.php | 4 ++--
lib/navigation/Navigation.php | 5 ++++-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lib/classes/Avatar.class.php b/lib/classes/Avatar.class.php
index ac074d63cdd..b6165bd89be 100644
--- a/lib/classes/Avatar.class.php
+++ b/lib/classes/Avatar.class.php
@@ -118,7 +118,9 @@ class Avatar {
public function getCustomAvatarUrl($size, $ext = 'png')
{
- $retina = $GLOBALS['auth']->auth['devicePixelRatio'] > 1.2;
+ $retina = isset($GLOBALS['auth']->auth['devicePixelRatio'])
+ ? $GLOBALS['auth']->auth['devicePixelRatio'] > 1.2
+ : false;
$size = $retina && file_exists($this->getCustomAvatarPath($size, 'png', true))
? $size."@2x"
: $size;
diff --git a/lib/classes/MyRealmModel.php b/lib/classes/MyRealmModel.php
index 9f62b427cb2..878b4a267cd 100644
--- a/lib/classes/MyRealmModel.php
+++ b/lib/classes/MyRealmModel.php
@@ -308,8 +308,8 @@ class MyRealmModel
foreach ($courses as $index => $course) {
// export object to array for simple handling
$_course = $course->toArray($param_array);
- $_course['start_semester'] = $course->start_semester->name;
- $_course['end_semester'] = $course->end_semester->name;
+ $_course['start_semester'] = $course->start_semester ? $course->start_semester->name : null;
+ $_course['end_semester'] = $course->end_semester ? $course->end_semester->name : null;
$_course['sem_class'] = $course->getSemClass();
$_course['obj_type'] = 'sem';
diff --git a/lib/navigation/Navigation.php b/lib/navigation/Navigation.php
index ab4a8fe9736..149210849f9 100644
--- a/lib/navigation/Navigation.php
+++ b/lib/navigation/Navigation.php
@@ -514,8 +514,11 @@ class Navigation implements IteratorAggregate
*/
public function insertSubNavigation($name, Navigation $navigation, $where)
{
+ $subnav = [];
+
+ $done = false;
foreach ($this->getSubNavigation() as $key => $nav) {
- if ($key == $where) {
+ if ($key === $where) {
$subnav[$name] = $navigation;
$done = true;
}
--
GitLab