DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message

Browse source 
Fixed #11800: Include path in the expected URL during Pre-Flight
This commit is contained in:
snipe 2023-03-06 09:36:15 -08:00 committed by GitHub
parent 39193a71b7 1d4f4b92de
commit f54d83ed59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/SettingsController.php
View file

@ -84,9 +84,8 @@ class SettingsController extends Controller
} }
$pageURL = $protocol.$host.$_SERVER['REQUEST_URI']; $pageURL = $protocol.$host.$_SERVER['REQUEST_URI'];
$start_settings['url_valid'] = (url('/').'/setup' === $pageURL); $start_settings['url_config'] = url('/').'/setup';
$start_settings['url_valid'] = ($start_settings['url_config'] === $pageURL);
$start_settings['url_config'] = url('/');
$start_settings['real_url'] = $pageURL; $start_settings['real_url'] = $pageURL;
$start_settings['php_version_min'] = true; $start_settings['php_version_min'] = true;