--- ECHO_content/ECHO_collection.py	2005/11/04 18:03:20	1.250
+++ ECHO_content/ECHO_collection.py	2005/11/10 12:01:12	1.252
@@ -1446,7 +1446,18 @@ class ECHO_externalLink(Folder,ECHO_basi
     security.declarePublic('content_html')
     def content_html(self):
         """template fuer content"""
-        return ECHO_basis.content_html(self,'externalLink')
+        ret= ECHO_basis.content_html(self,'externalLink')
+        
+        
+        try:
+            return ret.encode('utf-8')
+        
+        except:
+                    try: 
+                        return ret.decode('latin-1')
+                    except:
+             
+                        return ret
     
     def __init__(self,id,link,title,label,description,contentType,responsible,credits,weight,coords):
 
@@ -1519,7 +1530,8 @@ class ECHO_link(ECHO_externalLink):
         """external_link"""
 
         meta_type="ECHO_link"
-	manage_options = ECHO_externalLink.manage_options+(
+        
+        manage_options = ECHO_externalLink.manage_options+(
         	{'label':'add links config','action':'ECHO_link_addLinksForm'},
                 )
         
@@ -1537,16 +1549,29 @@ class ECHO_link(ECHO_externalLink):
   
         def content_html(self):
                 """template fuer link"""
-                
+        
+
                 if hasattr(self,"link_template"):
                         ret=ECHO_basis.content_html(self,'link')
+
                 else:
                         ret=ECHO_basis.content_html(self,'collection')
 
-                try:
-                    return ret.decode('utf-8')
-                except:
-                    return ret
+
+                #return ret
+                return ret
+#            
+#            
+#                try:
+#                    return ret.decode('utf-8')
+#                except:
+#                    try: 
+#                        return ret.decode('latin-1')
+#                    except:
+#                
+#                        return ret
+#        
+
                 
         def index_html(self):
                 """standard link"""