Merge branch 'craigk5n:master' into pretty

craigk5n · Aug 31, 2024 · 884832f · 884832f
2 parents 5ee0079 + c6f266e
commit 884832f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/includes/user.php b/includes/user.php
@@ -188,7 +188,7 @@ function user_load_variables ( $login, $prefix ) {
     $GLOBALS[$prefix . 'lastname'] = $row[1];
     $GLOBALS[$prefix . 'is_admin'] = $row[2];
     $GLOBALS[$prefix . 'email'] = empty ( $row[3] ) ? '' : $row[3];
-    if ( strlen ( $row[0] ) && strlen ( $row[1] ) )
+    if ( strlen($row[0] ?? '') && strlen($row[1] ?? '') )
       $GLOBALS[$prefix . 'fullname'] = "$row[0] $row[1]";
     else
       $GLOBALS[$prefix . 'fullname'] = $login;
@@ -490,7 +490,7 @@ function user_get_users ( $publicOnly=false ) {
     "ORDER BY $order1 cal_login" );
   if ( $res ) {
     while ( $row = dbi_fetch_row ( $res ) ) {
-      if ( strlen ( $row[1] ) && strlen ( $row[2] ) )
+      if ( strlen($row[1] ?? '') && strlen($row[2] ?? '') )
         $fullname = "$row[2] $row[1]";
       else
         $fullname = $row[0];

diff --git a/includes/views.php b/includes/views.php
@@ -7,6 +7,7 @@
  * @license https://gnu.org/licenses/old-licenses/gpl-2.0.html GNU GPL
  * @package WebCalendar
  */
+require_once 'includes/init.php';
 
 /**
   * Initialize view variables and check permissions.