Skip to content
Snippets Groups Projects
Commit 9edf86c8 authored by rlucke's avatar rlucke
Browse files

Merge branch 'main' of gitlab.studip.de:studip/studip into main

parents 870d94d3 74569371
No related branches found
No related tags found
No related merge requests found
...@@ -172,7 +172,12 @@ class OpenGraphURL extends SimpleORMap ...@@ -172,7 +172,12 @@ class OpenGraphURL extends SimpleORMap
], ],
]); ]);
$content = file_get_contents($this['url'], false, $context); $content = @file_get_contents($this['url'], false, $context);
if ($content === false) {
return;
}
$content = mb_encode_numericentity($content, [0x80, 0xffff, 0, 0xffff], $currentEncoding); $content = mb_encode_numericentity($content, [0x80, 0xffff, 0, 0xffff], $currentEncoding);
$old_libxml_error = libxml_use_internal_errors(true); $old_libxml_error = libxml_use_internal_errors(true);
$doc = new DOMDocument(); $doc = new DOMDocument();
......
...@@ -1865,6 +1865,9 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen ...@@ -1865,6 +1865,9 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
//Nothing we can do here. //Nothing we can do here.
return; return;
} }
if (User::findCurrent()->id === $booking_user->id) {
return;
}
$template_factory = new Flexi_TemplateFactory( $template_factory = new Flexi_TemplateFactory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/' $GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
......
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