From d303dc607215f6570ad8950f39c8d7d60ccfaa17 Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Fri, 22 Jun 2012 14:23:05 +0000
Subject: [PATCH]
---
.../trunk/core/tests/class/DataObjectController.php | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/core/trunk/core/tests/class/DataObjectController.php b/core/trunk/core/tests/class/DataObjectController.php
index 31672e5a22f..0fc63b17223 100644
--- a/core/trunk/core/tests/class/DataObjectController.php
+++ b/core/trunk/core/tests/class/DataObjectController.php
@@ -209,11 +209,7 @@ class dataObjectController extends DOMDocument
{
$objectSchema = $this->schema->getObjectSchema($objectName);
if($objectSchema->{'das:label'}) return $objectSchema->{'das:label'};
- elseif($objectSchema->name) return $objectSchema->name;
- elseif($objectSchema->ref) {
- $objectSchema = $objectSchema->getRefElement();
- return $this->getLabel($objectSchema->name);
- }
+ else return $objectSchema->name;
}
public function getContentLabels($objectName) {
@@ -222,12 +218,7 @@ class dataObjectController extends DOMDocument
for($i=0; $i<$childElements->length;$i++) {
$childElement = $childElements->item($i);
if($childElement->{'das:label'}) $label = $childElement->{'das:label'};
- elseif($childElement->name) $label = $childElement->name;
- elseif($childElement->ref) {
- $childElement = $childElement->getRefElement();
- if($childElement->{'das:label'}) $label = $childElement->{'das:label'};
- else $label = $childElement->name;
- }
+ else $label = $childElement->name;
$labels[$childElement->name] = $label;
}
return $labels;
--
GitLab