mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-25 05:34:06 -08:00
Merge pull request #14986 from marcusmoore/bug/sc-25926
Fixed extension requirement checking in upgrade script
This commit is contained in:
commit
f027fd5f21
13
upgrade.php
13
upgrade.php
|
@ -282,19 +282,24 @@ foreach ($required_exts_array as $required_ext) {
|
|||
// Split the either/ors by their pipe and put them into an array
|
||||
$require_either = explode("|", $required_ext);
|
||||
|
||||
$has_one_required_ext = false;
|
||||
|
||||
// Now loop through the either/or array and see whether any of the options match
|
||||
foreach ($require_either as $require_either_value) {
|
||||
|
||||
if (in_array($require_either_value, $loaded_exts_array)) {
|
||||
$ext_installed .= '√ '.$require_either_value." is installed!\n";
|
||||
break;
|
||||
// If no match, add it to the string for errors
|
||||
} else {
|
||||
$ext_missing .= '✘ MISSING PHP EXTENSION: '.str_replace("|", " OR ", $required_ext)."\n";
|
||||
$has_one_required_ext = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// If no match, add it to the string for errors
|
||||
if (!$has_one_required_ext) {
|
||||
$ext_missing .= '✘ MISSING PHP EXTENSION: '.str_replace("|", " OR ", $required_ext)."\n";
|
||||
break;
|
||||
}
|
||||
|
||||
// If this isn't an either/or option, just add it to the string of errors conventionally
|
||||
} elseif (!in_array($required_ext, $recommended_exts_array)){
|
||||
$ext_missing .= '✘ MISSING PHP EXTENSION: '.$required_ext."\n";
|
||||
|
|
Loading…
Reference in a new issue