Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -253,6 +253,7 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
}
|
||||
|
||||
$appsToCheck = array( $app );
|
||||
$childAppsToRemove = array();
|
||||
|
||||
foreach( $data['choose_what_to_convert'] as $application )
|
||||
{
|
||||
@@ -297,8 +298,15 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
/* Can't find the table */
|
||||
catch( \IPS\convert\Exception $e )
|
||||
{
|
||||
$form->error = $e->getMessage();
|
||||
return $form;
|
||||
if( $appToCheck->sw != 'core' )
|
||||
{
|
||||
$childAppsToRemove[] = $appToCheck->sw;
|
||||
}
|
||||
else
|
||||
{
|
||||
$form->error = $e->getMessage();
|
||||
return $form;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -361,6 +369,11 @@ class _create extends \IPS\Dispatcher\Controller
|
||||
continue;
|
||||
}
|
||||
|
||||
if( \in_array( $application, $childAppsToRemove ) )
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
$childApp = clone $app;
|
||||
$childApp->parent = $app->app_id;
|
||||
|
||||
|
||||
Reference in new issue
Block a user