From 561e7a492d825e23aa807c2fac18a47356ffe4bd Mon Sep 17 00:00:00 2001
From: Shawn Rice <zooley@purdue.edu>
Date: Wed, 3 Apr 2024 13:28:48 -0400
Subject: [PATCH] fix(users): Check prop has value before parsing Cannot pass
 `null` to `preg_match()`

---
 .../Users/Resources/views/site/account.blade.php       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Modules/Users/Resources/views/site/account.blade.php b/app/Modules/Users/Resources/views/site/account.blade.php
index 45c223c2a..0d987f803 100644
--- a/app/Modules/Users/Resources/views/site/account.blade.php
+++ b/app/Modules/Users/Resources/views/site/account.blade.php
@@ -145,28 +145,28 @@
 												<select class="form-control property-edit" id="INPUT_loginshell" data-prop="loginshell">
 													<?php
 													$selected = '';
-													if (preg_match("/bash$/", $user->loginShell)):
+													if ($user->loginShell && preg_match("/bash$/", $user->loginShell)):
 														$selected = ' selected="selected"';
 													endif;
 													?>
 													<option value="/bin/bash"<?php echo $selected; ?>>bash</option>
 													<?php
 													$selected = '';
-													if (preg_match("/\/csh$/", $user->loginShell)):
+													if ($user->loginShell && preg_match("/\/csh$/", $user->loginShell)):
 														$selected = ' selected="selected"';
 													endif;
 													?>
 													<option value="/bin/csh"<?php echo $selected; ?>>csh</option>
 													<?php
 													$selected = '';
-													if (preg_match("/tcsh$/", $user->loginShell)):
+													if ($user->loginShell && preg_match("/tcsh$/", $user->loginShell)):
 														$selected = ' selected="selected"';
 													endif;
 													?>
 													<option value="/bin/tcsh"<?php echo $selected; ?>>tcsh</option>
 													<?php
 													$selected = '';
-													if (preg_match("/zsh$/", $user->loginShell)):
+													if ($user->loginShell && preg_match("/zsh$/", $user->loginShell)):
 														$selected = ' selected="selected"';
 													endif;
 													?>
@@ -174,7 +174,7 @@
 												@if (auth()->user()->can('manage users'))
 													<?php
 													$selected = '';
-													if (preg_match("/nologin$/", $user->loginShell)):
+													if ($user->loginShell && preg_match("/nologin$/", $user->loginShell)):
 														$selected = ' selected="selected"';
 													endif;
 													?>