mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-10 05:26: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($arr = $this->callHook('addDocumentContentFile')) {
|
||||||
if(is_array($arr)) {
|
foreach($arr as $ar)
|
||||||
$this->formField($arr[0], $arr[1], isset($arr[2]) ? $arr[2] : null);
|
if(is_array($ar)) {
|
||||||
} elseif(is_string($arr)) {
|
$this->formField($ar[0], $ar[1], isset($ar[2]) ? $ar[2] : null);
|
||||||
echo $arr;
|
} elseif(is_string($ar)) {
|
||||||
}
|
echo $ar;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
|
if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
|
||||||
$this->formField(
|
$this->formField(
|
||||||
|
|
|
@ -243,7 +243,7 @@ console.log(element);
|
||||||
if($arr = $this->callHook('addDocumentContentFile')) {
|
if($arr = $this->callHook('addDocumentContentFile')) {
|
||||||
foreach($arr as $ar)
|
foreach($arr as $ar)
|
||||||
if(is_array($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)) {
|
} elseif(is_string($ar)) {
|
||||||
echo $ar;
|
echo $ar;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user