Skip to content

Commit

Permalink
Merge pull request #509 from dreamfactorysoftware/develop
Browse files Browse the repository at this point in the history
Merge Develop
  • Loading branch information
Anas committed Nov 30, 2023
2 parents 8c3c7ad + 7a0e6e0 commit 3908e0e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 14 deletions.
12 changes: 1 addition & 11 deletions app/Http/Controllers/SplashController.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,20 +58,10 @@ public function createFirstUser()
if (! $user) {
return view('firstUser', $data);
}

$jwt = null;
if (true === $login = Session::setUserInfoWithJWT($user)) {
$sessionInfo = Session::getPublicInfo();
$jwt = Arr::get($sessionInfo, 'session_token');
}
}
}

if (! empty($jwt)) {
return redirect()->to('/?session_token='.$jwt);
} else {
return redirect()->to('/');
}
return redirect()->to('/');
}

/**
Expand Down
2 changes: 1 addition & 1 deletion installers/source/centos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ install_mcrypt () {
}

install_mongodb () {
pecl install mongodb
pecl install mongodb <<<'no'
if (($? >= 1)); then
echo_with_color red "\nMongo DB extension installation error." >&5
kill $!
Expand Down
2 changes: 1 addition & 1 deletion installers/source/debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ install_mcrypt () {
}

install_mongodb () {
pecl install mongodb
pecl install mongodb <<<'no'
if (($? >= 1)); then
echo_with_color red "\nMongo DB extension installation error." >&5
kill $!
Expand Down
2 changes: 1 addition & 1 deletion installers/source/ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ install_mcrypt () {
}

install_mongodb () {
pecl install mongodb
pecl install mongodb <<<'no'
if (($? >= 1)); then
echo_with_color red "\nMongo DB extension installation error." >&5
kill $!
Expand Down

0 comments on commit 3908e0e

Please sign in to comment.