--- ECHO_content/ECHO_collection.py	2007/07/19 11:02:28	1.289
+++ ECHO_content/ECHO_collection.py	2007/07/19 14:13:13	1.290
@@ -200,6 +200,8 @@ class ECHO_locale(ZopePageTemplate):
                 self.title=title
                 self.label=label
                 if text:
+                        if content_type is None:
+                            content_type = self.content_type
                         self.pt_edit(text, content_type)
                 self.id=id
 
@@ -218,6 +220,8 @@ class ECHO_locale(ZopePageTemplate):
                 self.title=title
                 self.label=label
                 if not text is None:
+                        if content_type is None:
+                            content_type = self.content_type
                         self.pt_edit(text, content_type)
 
                 if RESPONSE is not None:
@@ -307,6 +311,8 @@ class ECHO_layoutTemplate(ZopePageTempla
         if text is None:
             self._default_content_fn = os.path.join(package_home(globals()),'zpt','ECHO_%s_template_standard.zpt'%EchoType)
             text = open(self._default_content_fn).read()
+        if content_type is None:
+            content_type = self.content_type
         self.pt_edit(text, content_type)
 
 
@@ -4134,6 +4140,8 @@ class ECHO_linkList(ZopePageTemplate,ECH
          self.ZBindings_edit(self._default_bindings)
          if text is None:
              text = ''
+         if content_type is None:
+             content_type = self.content_type
          self.pt_edit(text, contentType)