various bugfixes
This commit is contained in:
@ -266,6 +266,7 @@ class Installer {
|
||||
}
|
||||
|
||||
public function getModelInfo( $filename, $folder = '' ) {
|
||||
Debug::debug( 'getModelInfo filename: ' . $filename . ', folder: ' . $folder);
|
||||
$object = self::emptyModule( 'model', $folder, $filename );
|
||||
|
||||
if ( ! class_exists( $object->class ) ) {
|
||||
@ -363,7 +364,7 @@ class Installer {
|
||||
return false;
|
||||
}
|
||||
|
||||
$errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
|
||||
$errors[] = [ 'errorInfo' => $module_data['name'] . " Plugin has been installed." ];
|
||||
self::$errors = array_merge( self::$errors, $errors );
|
||||
return true;
|
||||
}
|
||||
@ -393,7 +394,7 @@ class Installer {
|
||||
}
|
||||
|
||||
$this->removeModule( $module_data->name, true );
|
||||
$errors[] = [ 'errorInfo' => $module_data->name . " has been installed." ];
|
||||
$errors[] = [ 'errorInfo' => $module_data->name . " Plugin has been uninstalled." ];
|
||||
self::$errors = array_merge( self::$errors, $errors );
|
||||
return true;
|
||||
}
|
||||
@ -438,7 +439,7 @@ class Installer {
|
||||
|
||||
// exclude any flags we don't have a matric map for
|
||||
if ( empty( $module_data->class_object->$matrix ) ) {
|
||||
Debug::warn( "$flag_type does not have a proper matrix map and cannot be installed." );
|
||||
Debug::warn( "$flag_type does not have a proper matrix map and cannot be uninstalled." );
|
||||
$module_data->$flag_type = INSTALL_STATUS_NOT_FOUND;
|
||||
}
|
||||
}
|
||||
@ -465,7 +466,7 @@ class Installer {
|
||||
return false;
|
||||
}
|
||||
|
||||
$errors[] = [ 'errorInfo' => $module_data['name'] . " has been installed." ];
|
||||
$errors[] = [ 'errorInfo' => $module_data['name'] . " model has been installed." ];
|
||||
self::$errors = array_merge( self::$errors, $errors );
|
||||
return true;
|
||||
}
|
||||
@ -512,7 +513,7 @@ class Installer {
|
||||
return false;
|
||||
}
|
||||
|
||||
$errors[] = [ 'errorInfo' => $module_data->name . " has been uninstalled." ];
|
||||
$errors[] = [ 'errorInfo' => $module_data->name . " model has been uninstalled." ];
|
||||
self::$errors = array_merge( self::$errors, $errors );
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user