Merge branch 'craigk5n:master' into php

craigk5n · Jul 29, 2024 · daf74df · daf74df
2 parents 5c31cd2 + 3ab2e0f
commit daf74df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/category.php b/category.php
@@ -141,8 +141,8 @@
 
       </div>
       <div class="modal-footer">
-        <button class="btn btn-default" id="modalclosebtn" data-dismiss="modal"'
-    . ' type="button">' . translate ( 'Close' ) . '</button>
+        <button class="btn btn-default" id="modalclosebtn" data-dismiss="modal"
+                type="button"><?php etranslate ( 'Close' ); ?></button>
       </div>
     </div>
   </div>

diff --git 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.
    */

diff --git 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;