wip
This commit is contained in:
@ -158,6 +158,10 @@ class Installer {
|
||||
} else {
|
||||
self::$installJson['modules'][$name]['enabled_txt'] = '<span class="text-danger">No</span>';
|
||||
}
|
||||
// in this case only, we save an array to remove the objects later, so an array stored is a success.
|
||||
if ( ! empty( self::$installJson['modules'][$name]['resources_installed'] ) && is_array( self::$installJson['modules'][$name]['resources_installed'] ) ) {
|
||||
self::$installJson['modules'][$name]['resources_installed'] = INSTALL_STATUS_SUCCESS;
|
||||
}
|
||||
}
|
||||
return self::$installJson['modules'][$name];
|
||||
}
|
||||
@ -422,7 +426,7 @@ class Installer {
|
||||
}
|
||||
|
||||
// exclude any flags that have already been successfully installed
|
||||
if ( !empty( $module_data->$flag_type ) && $module_data->$flag_type == INSTALL_STATUS_SUCCESS ) {
|
||||
if ( ! empty( $module_data->$flag_type ) && $module_data->$flag_type == INSTALL_STATUS_SUCCESS ) {
|
||||
Debug::warn( "$flag_type has already been successfully installed" );
|
||||
$flags[ $flag_type ] = false;
|
||||
}
|
||||
@ -530,7 +534,7 @@ class Installer {
|
||||
}
|
||||
|
||||
foreach ( $flags as $flag_type ) {
|
||||
if ( ! in_array( $modelInfo[ $flag_type ], [ INSTALL_STATUS_SUCCESS, INSTALL_STATUS_NOT_REQUIRED ] ) ) {
|
||||
if ( empty( $modelInfo[ $flag_type ] ) || ! in_array( $modelInfo[ $flag_type ], [ INSTALL_STATUS_SUCCESS, INSTALL_STATUS_NOT_REQUIRED ] ) ) {
|
||||
$modelInfo['installStatus'] = INSTALL_STATUS_PARTIALLY_INSTALLED;
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user