Version 4.7.0
This commit is contained in:
1 parent
517a5e1f70
commit
8ba7d43898
1933 files changed
+65613
-11332
No files matched your search
@@ -587,7 +587,15 @@ class _Javascript extends \IPS\Patterns\ActiveRecord
|
||||
|
||||
if ( \file_exists( $dir . '/order.txt' ) )
|
||||
{
|
||||
static::$_orders[ $app ][] = array( 'path' => str_replace( \IPS\ROOT_PATH, '', $dir ), 'contents' => file_get_contents( $dir . '/order.txt' ) );
|
||||
$contents = file_get_contents( $dir . '/order.txt' );
|
||||
|
||||
/* Enforce \n line endings */
|
||||
if( mb_strtolower( mb_substr( PHP_OS, 0, 3 ) ) === 'win' )
|
||||
{
|
||||
$contents = str_replace( "\r\n", "\n", $contents );
|
||||
}
|
||||
|
||||
static::$_orders[ $app ][] = array( 'path' => str_replace( \IPS\ROOT_PATH, '', $dir ), 'contents' => $contents );
|
||||
|
||||
$order = \file( $dir . '/order.txt' );
|
||||
|
||||
@@ -653,7 +661,7 @@ class _Javascript extends \IPS\Patterns\ActiveRecord
|
||||
'javascript_path' => $path,
|
||||
'javascript_name' => $file->getFileName(),
|
||||
'javascript_type' => static::_getType( $dir . '/', $file->getFileName() ),
|
||||
'javascript_content' => $js,
|
||||
'javascript_content' => ( mb_strtolower( mb_substr( PHP_OS, 0, 3 ) ) === 'win' ) ? str_replace( "\r\n", "\n", $js ) : $js,
|
||||
'javascript_position' => $position,
|
||||
'javascript_version' => \IPS\Application::load( ( $app == 'global' ? 'core' : $app ) )->long_version,
|
||||
'javascript_key' => md5( $app . ';' . $location . ';' . $path . ';' . $file->getFileName() )
|
||||
|
||||
Reference in new issue
Block a user