mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-09 04:56:06 +00:00
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
commit
efdb37399d
|
@ -418,11 +418,12 @@ console.log(params);
|
|||
);
|
||||
}
|
||||
if($arr = $this->callHook('addDocumentContentFile')) {
|
||||
if(is_array($arr)) {
|
||||
$this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
|
||||
} elseif(is_string($arr)) {
|
||||
echo $arr;
|
||||
}
|
||||
foreach($arr as $ar)
|
||||
if(is_array($ar)) {
|
||||
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);
|
||||
} elseif(is_string($ar)) {
|
||||
echo $ar;
|
||||
}
|
||||
}
|
||||
if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
|
||||
$this->formField(
|
||||
|
|
|
@ -243,7 +243,7 @@ console.log(element);
|
|||
if($arr = $this->callHook('addDocumentContentFile')) {
|
||||
foreach($arr as $ar)
|
||||
if(is_array($ar)) {
|
||||
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);
|
||||
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);
|
||||
} elseif(is_string($ar)) {
|
||||
echo $ar;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user