From 0e46fc6c486a51b937b9723be95756efcf7a32af Mon Sep 17 00:00:00 2001 From: Ziermaier Maximilian Date: Tue, 12 Mar 2024 18:36:22 +0100 Subject: [PATCH 1/5] Update .gitignore added composer.json --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f34d28451..150cc2c95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.class +composer.json .DS_Store .htaccess includes/htmlare* From 74aee6b999ee53028c7c7fe42f041643d191d755 Mon Sep 17 00:00:00 2001 From: Maximilian Ziermaier Date: Tue, 12 Mar 2024 19:51:31 +0100 Subject: [PATCH 2/5] add select_db before query in function dbi_query --- includes/dbi4php.php | 1 + 1 file changed, 1 insertion(+) diff --git a/includes/dbi4php.php b/includes/dbi4php.php index 553d9b9cf..f98f2e0a7 100644 --- a/includes/dbi4php.php +++ b/includes/dbi4php.php @@ -337,6 +337,7 @@ function dbi_query( $sql, $fatalOnError = true, $showError = true ) { } elseif( strcmp( $GLOBALS['db_type'], 'mysqli' ) == 0 ) { $found_db_type = true; try { + $GLOBALS['db_connection']->select_db($db_connection_info['database']); $res = $GLOBALS['db_connection']->query( $sql ); } catch (Exception $e) { $res = false; From 8ca115b939ce45cdd4c6d664138ac9b38af84f38 Mon Sep 17 00:00:00 2001 From: Maximilian Ziermaier Date: Tue, 12 Mar 2024 20:57:55 +0100 Subject: [PATCH 3/5] Allow null for $_dueDate to prevent following error in month.php Fatal error: Uncaught TypeError: Cannot assign null to property Event::$_dueDate of type string in /var/www/html/includes/classes/Event.php:205 Stack trace: #0 /var/www/html/includes/functions.php(5324): Event->__construct() #1 /var/www/html/includes/functions.php(5498): query_events() #2 /var/www/html/month.php(44): read_events() #3 {main} thrown in /var/www/html/includes/classes/Event.php on line 205 --- includes/classes/Event.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/classes/Event.php b/includes/classes/Event.php index 994ed8140..cb9ede7e6 100644 --- a/includes/classes/Event.php +++ b/includes/classes/Event.php @@ -113,7 +113,7 @@ class Event { /** * The event's dueDate. */ - private string $_dueDate; + private ?string $_dueDate; /** * The event's dueTime. */ From 0774194bbd4764934a18183ed80af2dbaa7d502a Mon Sep 17 00:00:00 2001 From: Maximilian Ziermaier Date: Tue, 12 Mar 2024 21:07:53 +0100 Subject: [PATCH 4/5] Modal Close Button etranslate corrected --- category.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/category.php b/category.php index d3afcf4db..d8cccb1e4 100644 --- a/category.php +++ b/category.php @@ -141,8 +141,8 @@ From 9a4508f28801f6d655d2fdcb778244ea98dd9f86 Mon Sep 17 00:00:00 2001 From: Maximilian Ziermaier Date: Tue, 12 Mar 2024 21:18:40 +0100 Subject: [PATCH 5/5] Revert "Update .gitignore" This reverts commit 0e46fc6c486a51b937b9723be95756efcf7a32af. --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 150cc2c95..f34d28451 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ *.class -composer.json .DS_Store .htaccess includes/htmlare*