DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2020-11-25 01:53:21 -08:00
parent bef42eb43c 820a39cc90
commit 96eb623229
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Console/Commands/SendExpectedCheckinAlerts.php
View file

@ -8,6 +8,7 @@ use App\Notifications\ExpectedCheckinAdminNotification;
use App\Notifications\ExpectedCheckinNotification; use App\Notifications\ExpectedCheckinNotification;
use Carbon\Carbon; use Carbon\Carbon;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use App\Models\Recipients\AlertRecipient;
class SendExpectedCheckinAlerts extends Command class SendExpectedCheckinAlerts extends Command
{ {

4
upgrade.php
View file

@ -3,8 +3,8 @@
$required_version = '7.2.0'; $required_version = '7.2.0';
if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { if ((strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') || (!function_exists('posix_getpwuid'))) {
echo "Skipping user check as it is not supported on Windows\n"; echo "Skipping user check as it is not supported on Windows or Posix is not installed on this server. \n";
} else { } else {
$pwu_data = posix_getpwuid(posix_geteuid()); $pwu_data = posix_getpwuid(posix_geteuid());
$username = $pwu_data['name']; $username = $pwu_data['name'];