Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -1382,6 +1382,14 @@ HTML,
|
||||
$changes
|
||||
);
|
||||
$changes['custom'] = true;
|
||||
if ( !isset( $properties[$key] ) )
|
||||
{
|
||||
$properties[ $key ] = $changes;
|
||||
}
|
||||
else
|
||||
{
|
||||
array_replace_recursive( $properties[ $key ], $changes );
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1407,9 +1415,9 @@ HTML,
|
||||
|
||||
/* These should never be set in the setting since other code assumes these properties are what's specified in the arrays */
|
||||
$properties[$key] = $properties[$key] ?? array();
|
||||
unset( $changes['pii'] );
|
||||
if ( !( $properties[$key]['custom'] ?? 0 ) )
|
||||
{
|
||||
unset( $changes['pii'] );
|
||||
unset( $changes['event_keys'] );
|
||||
unset( $changes['description'] );
|
||||
unset( $changes['short'] );
|
||||
|
||||
Reference in new issue
Block a user