--- ECHO_content/ECHO_collection.py 2005/10/26 11:18:19 1.239 +++ ECHO_content/ECHO_collection.py 2005/10/26 16:14:29 1.240 @@ -1503,11 +1503,17 @@ class ECHO_link(ECHO_externalLink): def content_html(self): """template fuer link""" + if hasattr(self,"link_template"): - return ECHO_basis.content_html(self,'link') + ret=ECHO_basis.content_html(self,'link') else: - return ECHO_basis.content_html(self,'collection') + ret=ECHO_basis.content_html(self,'collection') + try: + return ret.decode('utf-8') + except: + return ret + def index_html(self): """standard link""" if self.link: @@ -2217,8 +2223,12 @@ class ECHO_collection(Folder, Persistent def content_html(self,**argv): """template fuer content""" #print "NN",argv - return ECHO_basis.content_html(self,'collection') - + ret = ECHO_basis.content_html(self,'collection') + try: + return ret.decode('utf-8') + except: + return ret + def getCredits(self): """Ausgabe der credits""" if self.credits: