Version 4.7.0
This commit is contained in:
1 parent
517a5e1f70
commit
8ba7d43898
1933 files changed
+65613
-11332
No files matched your search
@@ -150,7 +150,7 @@ class _Template extends \IPS\Theme\Template
|
||||
}
|
||||
if( !\in_array( $bit, $allowedScriptBlocks ) and $this->templateName !== 'embed' and preg_match( "/<script((?!src).)*>/i", $output ) && $this->app != 'documentation' )
|
||||
{
|
||||
trigger_error( "There is a script block in {$functionName}. Please move all JavaScript into JS files.", E_USER_ERROR );
|
||||
//trigger_error( "There is a script block in {$functionName}. Please move all JavaScript into JS files.", E_USER_ERROR );
|
||||
}
|
||||
|
||||
/* Hooks */
|
||||
|
||||
@@ -407,6 +407,12 @@ class _Theme extends \IPS\Theme
|
||||
|
||||
/* Strip it */
|
||||
$html = ( isset($params[0]) ) ? str_replace( $params[0], '', $html ) : $html;
|
||||
|
||||
/* Enforce \n line endings */
|
||||
if( mb_strtolower( mb_substr( PHP_OS, 0, 3 ) ) === 'win' )
|
||||
{
|
||||
$html = str_replace( "\r\n", "\n", $html );
|
||||
}
|
||||
|
||||
$version = \IPS\Application::load( $app )->long_version;
|
||||
$save = array(
|
||||
@@ -593,6 +599,12 @@ class _Theme extends \IPS\Theme
|
||||
'added_to' => 0,
|
||||
'user_edited' => 0
|
||||
);
|
||||
|
||||
/* Enforce \n line endings */
|
||||
if( mb_strtolower( mb_substr( PHP_OS, 0, 3 ) ) === 'win' )
|
||||
{
|
||||
$css = str_replace( "\r\n", "\n", $css );
|
||||
}
|
||||
|
||||
/* If we're syncing designer mode, check for actual changes */
|
||||
if ( $id > 0 )
|
||||
|
||||
Reference in new issue
Block a user