Version 5.0.0 beta 7
This commit is contained in:
1 parent
fa2a720105
commit
54d5dcd0a0
156 files changed
+4337
-2995
No files matched your search
@@ -1017,6 +1017,11 @@ class Output
|
||||
*/
|
||||
public bool $bypassCsrfKeyCheck = FALSE;
|
||||
|
||||
/**
|
||||
* @var bool Flag to bypass datalayer in the page output
|
||||
*/
|
||||
public bool $bypassDataLayer = false;
|
||||
|
||||
/**
|
||||
* Send output
|
||||
*
|
||||
@@ -1050,7 +1055,7 @@ class Output
|
||||
}
|
||||
|
||||
/* Cache session Data Layer events */
|
||||
if ( !( $httpStatusCode === 200 AND !Request::i()->isAjax() AND $contentType == 'text/html' ) )
|
||||
if ( DataLayer::hasInstance() and !$this->bypassDataLayer and Dispatcher::hasInstance() and Dispatcher::i()->controllerLocation == 'front' and ( $httpStatusCode !== 200 OR Request::i()->isAjax() OR $contentType !== 'text/html' ) )
|
||||
{
|
||||
DataLayer::i()->cache();
|
||||
}
|
||||
@@ -1596,7 +1601,7 @@ class Output
|
||||
}
|
||||
|
||||
|
||||
if( isset( $this->sidebar['widgetareas']['sidebar'] ) and count( $this->sidebar['widgetareas']['sidebar'] ) )
|
||||
if( isset( $this->sidebar['widgetareas']['sidebar'] ) and !empty( $this->sidebar['widgetareas']['sidebar'] ) )
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -94,6 +94,18 @@ abstract class Node
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Any formatting necessary for custom fields added in formElements
|
||||
*
|
||||
* @param Model $node
|
||||
* @param array $values
|
||||
* @return array
|
||||
*/
|
||||
public function processForm( Model $node, array $values ) : array
|
||||
{
|
||||
return $values;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called after the Node form is saved
|
||||
*
|
||||
|
||||
Reference in new issue
Block a user