Version 4.7.0
This commit is contained in:
1 parent
517a5e1f70
commit
8ba7d43898
1933 files changed
+65613
-11332
No files matched your search
@@ -58,7 +58,7 @@ class _applications extends \IPS\Dispatcher\Controller
|
||||
|
||||
foreach( \IPS\Application::applications() as $app => $data )
|
||||
{
|
||||
$path = \IPS\ROOT_PATH . '/applications/' . $app;
|
||||
$path = \IPS\Application::getRootPath( $app ) . '/applications/' . $app;
|
||||
|
||||
if ( $app == 'chat' )
|
||||
{
|
||||
@@ -118,15 +118,19 @@ class _applications extends \IPS\Dispatcher\Controller
|
||||
'errors' => $errors,
|
||||
'current' => \IPS\Application::load( $app )->version,
|
||||
'available' => \IPS\Application::getAvailableVersion( $app, TRUE ),
|
||||
'force' => ( $app === 'core' and $availableVersion > $currentVersion )
|
||||
'force' => ( ( $app === 'core' or $app === 'cloud' ) and $availableVersion > $currentVersion )
|
||||
);
|
||||
}
|
||||
|
||||
/* Bring core app to top */
|
||||
$system['core'] = $apps['core'];
|
||||
unset( $apps['core'] );
|
||||
if ( isset( $apps['cloud'] ) )
|
||||
{
|
||||
$system['cloud'] = $apps['cloud'];
|
||||
unset( $apps['cloud'] );
|
||||
}
|
||||
$apps = array_merge( $system, $apps );
|
||||
|
||||
if( \count( $defaultTicks ) )
|
||||
{
|
||||
$form = new \IPS\Helpers\Form( 'applications', 'continue' );
|
||||
@@ -154,6 +158,11 @@ class _applications extends \IPS\Dispatcher\Controller
|
||||
{
|
||||
$_SESSION['apps']['core'] = 'core';
|
||||
}
|
||||
|
||||
if ( isset( $apps['cloud'] ) and $apps['cloud']['force'] )
|
||||
{
|
||||
$_SESSION['apps']['cloud'] = 'cloud';
|
||||
}
|
||||
|
||||
if( \count( $values['apps'] ) )
|
||||
{
|
||||
|
||||
@@ -80,7 +80,7 @@ class _login extends \IPS\Dispatcher\Controller
|
||||
$canUpgrade = FALSE;
|
||||
foreach( \IPS\Application::applications() as $app => $data )
|
||||
{
|
||||
$path = \IPS\ROOT_PATH . '/applications/' . $app;
|
||||
$path = \IPS\Application::getRootPath( $app ) . '/applications/' . $app;
|
||||
|
||||
if ( $app != 'chat' and is_dir( $path . '/data' ) )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user