From 3def7dbe24d73fdb388c2b6ed8b14656e40afcf8 Mon Sep 17 00:00:00 2001 From: pb Date: Mon, 15 Nov 2010 16:30:14 +0000 Subject: [PATCH] AbstractContentTypeLoader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kleiner Fehler in der if-Abfrage beseitig - Ein Fall war nicht breücksichtigt Quasi git-svn-id: https://svn.libreccm.org/ccm/trunk@608 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/AbstractContentTypeLoader.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java index fd0832187..a85b9b361 100755 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/AbstractContentTypeLoader.java @@ -227,10 +227,11 @@ public abstract class AbstractContentTypeLoader extends PackageLoader { // Save the current ct as possible parent if we haven't found any parent yet // or if the current ancestor list is longer than that one from the possible // parent earlier found - if (parent == null + if (!type.getClassName().equals(ct.getClassName()) + && (parent == null || (parent.getAncestors() != null - && ct.getAncestors() != null - && parent.getAncestors().length() < ct.getAncestors().length())) { + && ct.getAncestors() != null + && parent.getAncestors().length() < ct.getAncestors().length()))) { parent = ct; } }