Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

This commit is contained in:
Uwe Steinmann 2021-03-22 06:40:03 +01:00
commit ffc259c680

View File

@ -58,7 +58,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
$arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef); $arr = $this->callHook('editDocumentContentAttribute', $version, $attrdef);
if(is_array($arr)) { if(is_array($arr)) {
if($arr) { if($arr) {
$this->formField($arr[0], $arr[1]); $this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
} }
} elseif(is_string($arr)) { } elseif(is_string($arr)) {
echo $arr; echo $arr;
@ -70,7 +70,7 @@ class SeedDMS_View_EditAttributes extends SeedDMS_Bootstrap_Style {
$arrs = $this->callHook('addDocumentContentAttributes', $version); $arrs = $this->callHook('addDocumentContentAttributes', $version);
if(is_array($arrs)) { if(is_array($arrs)) {
foreach($arrs as $arr) { foreach($arrs as $arr) {
$this->formField($arr[0], $arr[1]); $this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
} }
} elseif(is_string($arrs)) { } elseif(is_string($arrs)) {
echo $arrs; echo $arrs;