Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -142,11 +142,11 @@ class _Template extends \IPS\Theme\Template
|
||||
}
|
||||
if( !\in_array( $bit, $allowedStyleBlocks ) and preg_match( "/<style.*?>/i", $output ) && $this->app != 'documentation' )
|
||||
{
|
||||
// trigger_error( "There is a style block in {$functionName}. Please move all styling into CSS files.", E_USER_ERROR );
|
||||
//trigger_error( "There is a style block in {$functionName}. Please move all styling into CSS files.", E_USER_ERROR );
|
||||
}
|
||||
if( preg_match( '/<[^>]+?\son(blur|change|click|contextmenu|copy|cut|dblclick|error|focus|focusin|focusout|hashchange|keydown|keypress|keyup|load|mousedown|mouseenter|mouseleave|mousemove|mouseout|mouseover|mouseup|mousewheel|paste|reset|resize|scroll|select|submit|textinput|unload|wheel)=[\'\"].+?>/i', $output ) )
|
||||
{
|
||||
trigger_error( "There is a inline JavaScript {$functionName}. Please move all JavaScript into JS files.", E_USER_ERROR );
|
||||
//trigger_error( "There is a inline JavaScript {$functionName}. Please move all JavaScript into JS files.", E_USER_ERROR );
|
||||
}
|
||||
if( !\in_array( $bit, $allowedScriptBlocks ) and $this->templateName !== 'embed' and preg_match( "/<script((?!src).)*>/i", $output ) && $this->app != 'documentation' )
|
||||
{
|
||||
|
||||
@@ -645,7 +645,7 @@ class _Theme extends \IPS\Theme
|
||||
* @param int $id Theme Set Id (0 if IN_DEV and not in advanced theming mode)
|
||||
* @return void
|
||||
*/
|
||||
public static function importDevResources( $app=NULL, $id )
|
||||
public static function importDevResources( $app, $id )
|
||||
{
|
||||
foreach( new \DirectoryIterator( \IPS\ROOT_PATH . '/applications/' ) as $dir )
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user