From 78b9ca469b5c2abc0b8e6c075bcb5d339697e1cc Mon Sep 17 00:00:00 2001
From: Cyril Vazquez <cyril.vazquez@maarch.org>
Date: Thu, 28 Jun 2012 09:43:21 +0000
Subject: [PATCH]
---
core/trunk/core/tests/class/DataObjectSchema.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/trunk/core/tests/class/DataObjectSchema.php b/core/trunk/core/tests/class/DataObjectSchema.php
index bff024801fb..1842bb73e98 100644
--- a/core/trunk/core/tests/class/DataObjectSchema.php
+++ b/core/trunk/core/tests/class/DataObjectSchema.php
@@ -158,10 +158,10 @@ class DataObjectSchema
$baseTypeName = $propertyType->name;
} else {
$typeContents = $this->xpath("./*[name()='xsd:restriction' or name()='xsd:list' or name()='xsd:union']", $propertyType)->item(0);
- if(substr($typeContents->base, 0, 4) == 'xsd:') {
+ if($typeContents->base && substr($typeContents->base, 0, 4) == 'xsd:') {
$baseTypeName = $typeContents->base;
- } elseif(substr($typeContents->{'das:base'}, 0, 4) == 'xsd:') {
- $baseTypeName = $typeContents->{'das:base'};
+ } elseif($typeContents->{'das:baseType'} && substr($typeContents->{'das:baseType'}, 0, 4) == 'xsd:') {
+ $baseTypeName = $typeContents->{'das:baseType'};
} else {
$baseType = $this->xpath("//xsd:simpleType[@name='".$typeContents->base."']")->item(0);
$baseTypeName = $this->getBaseTypeName($baseType);
--
GitLab