Version 5.0.0 beta 11.1

This commit is contained in:
Neo committed 2025-12-19 18:00:22 -08:00
1 parent 264eeb97e0
commit 90e8c7e903
466 files changed
+7796 -2394

No files matched your search

+8 -2
View File
@@ -382,10 +382,16 @@ class Output
public function js( string $file, string $app=NULL, string $location=NULL ): array
{
$file = trim( $file, '/' );
/* Legacy code support. The following directories were moved to /static */
if ( ( $app === "core" or $app === null) and $location === "interface" and preg_match( "/^(?:codemirror|fontawesome)/", $file ) )
{
$file = "static/" . $file;
}
if ( $location === 'interface' AND mb_substr( $file, -3 ) === '.js' )
{
return array( rtrim( Url::baseUrl( Url::PROTOCOL_RELATIVE ), '/' ) . "/applications/{$app}/interface/{$file}?v=" . ( defined( '\IPS\CACHEBUST_KEY' ) ? CACHEBUST_KEY : time() ) );
return array( rtrim( Url::baseUrl( Url::PROTOCOL_RELATIVE ), '/' ) . "/applications/{$app}/interface/{$file}?v=" . Javascript::javascriptCacheBustKey() );
}
elseif (IN_DEV)
{
@@ -1401,7 +1407,7 @@ class Output
{
if( Request::i()->isAjax() )
{
if ( $message !== '' )
if( !empty( $message ) )
{
$message = Member::loggedIn()->language()->checkKeyExists( $message ) ? Member::loggedIn()->language()->addToStack( $message ) : $message;
Member::loggedIn()->language()->parseOutputForDisplay( $message );