From a81d61c61dda89c86f1d2cab6db4ce752dd2392f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luca=20B=C3=B6sch?= <luca.boesch@bfh.ch>
Date: Sun, 4 Aug 2024 14:48:57 +0200
Subject: [PATCH] Circumvent sending null to preg_match and strip_tags

---
 local/kaltura/locallib.php    | 6 ++++--
 mod/kalvidassign/renderer.php | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/local/kaltura/locallib.php b/local/kaltura/locallib.php
index f12db817..fa37f6f4 100644
--- a/local/kaltura/locallib.php
+++ b/local/kaltura/locallib.php
@@ -238,8 +238,10 @@ function local_kaltura_get_endpoint($module) {
 function local_kaltura_add_kaf_uri_token($url) {
     $configsettings = local_kaltura_get_config();
     // For records that have been migrated from old kaf uri to token format by search and replace.
-    if (preg_match('/https?:\/\/'.KALTURA_URI_TOKEN.'/', $url)) {
-        $url = preg_replace('/https?:\/\/'.KALTURA_URI_TOKEN.'/', $configsettings->kaf_uri, $url);
+    if (!is_null($url)) {
+        if (preg_match('/https?:\/\/'.KALTURA_URI_TOKEN.'/', $url)) {
+            $url = preg_replace('/https?:\/\/'.KALTURA_URI_TOKEN.'/', $configsettings->kaf_uri, $url);
+        }
     }
     return $url;
 }
diff --git a/mod/kalvidassign/renderer.php b/mod/kalvidassign/renderer.php
index 7b71c906..170d71c5 100644
--- a/mod/kalvidassign/renderer.php
+++ b/mod/kalvidassign/renderer.php
@@ -211,7 +211,9 @@ public function col_submissioncomment($data) {
             $output .= html_writer::end_tag('textarea');
 
         } else {
-            $output = shorten_text(strip_tags($data->submissioncomment), 15);
+            if (isset($data->submissioncomment) && !is_null($data->submissioncomment)) { 
+                $output = shorten_text(strip_tags($data->submissioncomment), 15);
+            }
         }
 
         return $output;