diff --git a/application/libraries/StundenplanLib.php b/application/libraries/StundenplanLib.php
index 441bf0c75..5be6e4110 100644
--- a/application/libraries/StundenplanLib.php
+++ b/application/libraries/StundenplanLib.php
@@ -114,6 +114,7 @@ class StundenplanLib
return $stundenplan_data;
$stundenplan_data = getData($stundenplan_data) ?? [];
+ $this->_ci->addMeta("stundenplanData", $stundenplan_data);
$function_error = $this->expandObjectInformation($stundenplan_data);
if ($function_error)
return $function_error;
@@ -387,7 +388,14 @@ class StundenplanLib
$res_lektor_start_str = date('Y-m-d', $res_lektor_start);
$res_lektor_ende_str = date('Y-m-d', $res_lektor_ende);
- $show_delete = (($berechtigt_begrenzt && ($item->insertvon == getAuthUID() || in_array(getAuthUID(), $item->uids))) &&
+ $show_delete = (
+ (
+ $berechtigt_begrenzt &&
+ (
+ (isset($item->insertvon) && $item->insertvon == getAuthUID()) ||
+ (isset($item->uids) && in_array(getAuthUID(), $item->uids))
+ )
+ ) &&
$start_date_str >= $res_lektor_start_str &&
$start_date_str <= $res_lektor_ende_str
);
diff --git a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
index ccef52686..a262739e1 100644
--- a/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
+++ b/system/dbupdate_3.4/68957_dashboard_bookmark_neue_Spalte_sort.php
@@ -43,15 +43,17 @@ if($result = @$db->db_query("SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABL
AND TABLE_NAME='tbl_bookmark' AND COLUMN_NAME = 'tag'
AND DATA_TYPE='character varying' AND character_maximum_length='255';"))
{
- $qry = "
- ALTER TABLE dashboard.tbl_bookmark
- ALTER COLUMN tag TYPE jsonb
- USING tag::jsonb;
- ";
+ if($db->db_num_rows($result) > 0)
+ {
+ $qry = "
+ ALTER TABLE dashboard.tbl_bookmark
+ ALTER COLUMN tag TYPE jsonb
+ USING tag::jsonb;
+ ";
- if (!$db->db_query($qry))
- echo 'dashboard.tbl_bookmark ' . $db->db_last_error() . '
';
- else
- echo '
Tabelle dashboard.tbl_bookmark: Spalte tag auf Typ JSONB geändert';
-
-}
\ No newline at end of file
+ if (!$db->db_query($qry))
+ echo 'dashboard.tbl_bookmark ' . $db->db_last_error() . '
';
+ else
+ echo '
Tabelle dashboard.tbl_bookmark: Spalte tag auf Typ JSONB geändert';
+ }
+}