Fixed gh-511 so that custom fields also get copied to module fields if set to do so.

This commit is contained in:
2020-01-26 00:24:42 +02:00
parent a31f09aaa3
commit 630bfcb177
5 changed files with 14 additions and 14 deletions

View File

@ -347,13 +347,6 @@ class Fields extends Structure
*/
public $movedPublishingFields = array();
/**
* Extention Custom Fields
*
* @var array
*/
public $extentionCustomfields = array();
/**
* Set the line number in comments
*
@ -1720,8 +1713,8 @@ class Fields extends Structure
}
$field .= PHP_EOL . $this->_t(2) . $taber . "/>";
// incase the field is in the config and has not been set
if ('config' === $view_name_single && 'configs' === $view_name_list||
strpos($view_name_single, 'P|uG!n') !== false)
if ('config' === $view_name_single && 'configs' === $view_name_list ||
(strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false))
{
// set lang (just incase)
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
@ -2208,7 +2201,7 @@ class Fields extends Structure
}
// incase the field is in the config and has not been set (or is part of a plugin or module)
if (('config' === $view_name_single && 'configs' === $view_name_list) ||
strpos($view_name_single, 'P|uG!n') !== false)
(strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false))
{
// set lang (just incase)
$listLangName = $langView . '_' . ComponentbuilderHelper::safeString($name, 'U');
@ -3324,7 +3317,7 @@ class Fields extends Structure
}
}
// if this field gets used in plugin or module we should track it so if needed we can copy it over
if (strpos($view_name_single, 'P|uG!n') !== false &&
if ((strpos($view_name_single, 'P|uG!n') !== false || strpos($view_name_single, 'M0dU|3') !== false) &&
isset($data['custom']) && isset($data['custom']['type']))
{
$this->extentionCustomfields[$data['type']] = $data['custom']['type'];