mirror of
https://git.code.sf.net/p/seeddms/code
synced 2024-11-26 15:32:13 +00:00
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
This commit is contained in:
commit
c1c7c66df8
|
@ -276,7 +276,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
|||
if($attributes = $document->getAttributes()) {
|
||||
foreach($attributes as $attribute) {
|
||||
$attrdef = $attribute->getAttributeDefinition();
|
||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
|
||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -332,7 +332,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
|||
if($attributes = $version->getAttributes()) {
|
||||
foreach($attributes as $attribute) {
|
||||
$attrdef = $attribute->getAttributeDefinition();
|
||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".$attribute->getValue()."</attr>\n";
|
||||
echo $indent." <attr type=\"user\" attrdef=\"".$attrdef->getID()."\">".wrapWithCData($attribute->getValue())."</attr>\n";
|
||||
}
|
||||
}
|
||||
if($statuslog = $version->getStatusLog()) {
|
||||
|
@ -623,7 +623,7 @@ if($attrdefs) {
|
|||
echo "\">\n";
|
||||
echo " <attr name=\"name\">".$attrdef->getName()."</attr>\n";
|
||||
echo " <attr name=\"multiple\">".$attrdef->getMultipleValues()."</attr>\n";
|
||||
echo " <attr name=\"valueset\">".$attrdef->getValueSet()."</attr>\n";
|
||||
echo " <attr name=\"valueset\">".wrapWithCData($attrdef->getValueSet())."</attr>\n";
|
||||
echo " <attr name=\"type\">".$attrdef->getType()."</attr>\n";
|
||||
echo " <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
|
||||
echo " <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";
|
||||
|
|
Loading…
Reference in New Issue
Block a user