mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-14 05:31:42 +00:00
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
This commit is contained in:
commit
89539bbcb8
|
@ -276,7 +276,7 @@ function tree($folder, $parent=null, $indent='', $skipcurrent=false) { /* {{{ */
|
||||||
if($attributes = $document->getAttributes()) {
|
if($attributes = $document->getAttributes()) {
|
||||||
foreach($attributes as $attribute) {
|
foreach($attributes as $attribute) {
|
||||||
$attrdef = $attribute->getAttributeDefinition();
|
$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()) {
|
if($attributes = $version->getAttributes()) {
|
||||||
foreach($attributes as $attribute) {
|
foreach($attributes as $attribute) {
|
||||||
$attrdef = $attribute->getAttributeDefinition();
|
$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()) {
|
if($statuslog = $version->getStatusLog()) {
|
||||||
|
@ -625,7 +625,7 @@ if($attrdefs) {
|
||||||
echo "\">\n";
|
echo "\">\n";
|
||||||
echo " <attr name=\"name\">".$attrdef->getName()."</attr>\n";
|
echo " <attr name=\"name\">".$attrdef->getName()."</attr>\n";
|
||||||
echo " <attr name=\"multiple\">".$attrdef->getMultipleValues()."</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=\"type\">".$attrdef->getType()."</attr>\n";
|
||||||
echo " <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
|
echo " <attr name=\"minvalues\">".$attrdef->getMinValues()."</attr>\n";
|
||||||
echo " <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";
|
echo " <attr name=\"maxvalues\">".$attrdef->getMaxValues()."</attr>\n";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user