Version 4.3.0
This commit is contained in:
1 parent
96997ddd8e
commit
fe1acf984a
1349 files changed
+116159
-67711
No files matched your search
@@ -769,6 +769,9 @@ class _languages extends \IPS\Node\Controller
|
||||
$data = array( 'apps' => array(), 'id' => $insertId );
|
||||
return array( $data, \IPS\Member::loggedIn()->language()->get('processing') );
|
||||
}
|
||||
|
||||
/* Only import language strings from applications we have installed */
|
||||
$applications = array_keys( \IPS\Application::applications() );
|
||||
|
||||
/* Move to correct app */
|
||||
$appKey = NULL;
|
||||
@@ -777,7 +780,7 @@ class _languages extends \IPS\Node\Controller
|
||||
while ( $xml->read() )
|
||||
{
|
||||
$appKey = $xml->getAttribute('key');
|
||||
if ( !array_key_exists( $appKey, $data['apps'] ) )
|
||||
if ( !array_key_exists( $appKey, $data['apps'] ) AND in_array( $appKey, $applications ) )
|
||||
{
|
||||
/* Get version */
|
||||
$version = $xml->getAttribute('version');
|
||||
@@ -940,7 +943,8 @@ class _languages extends \IPS\Node\Controller
|
||||
{
|
||||
\IPS\Member::updateAllMembers( array( 'language' => \IPS\Request::i()->id ) );
|
||||
}
|
||||
\IPS\Session::i()->log( 'acplogs__members_language_reset', array( \IPS\Lang::load( \IPS\Request::i()->id )->title => FALSE ) );
|
||||
|
||||
\IPS\Session::i()->log( 'acplogs__members_language_reset', array( \IPS\Lang::load( \IPS\Request::i()->id ?: \IPS\Lang::defaultLanguage() )->title => FALSE ) );
|
||||
\IPS\Output::i()->redirect( \IPS\Http\Url::internal( 'app=core&module=languages&controller=languages' ), 'reset' );
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user