--- ECHO_content/ECHO_Nav.py	2007/02/22 10:29:00	1.80
+++ ECHO_content/ECHO_Nav.py	2008/08/21 07:44:56	1.82
@@ -29,7 +29,7 @@ from Products.PageTemplates.ZopePageTemp
 import os.path
 
 import urllib
-from ECHO_helpers import displayTypes,checkOnlyOneInGroup
+from ECHO_helpers import displayTypes,checkOnlyOneInGroup,unicodify
 from ECHO_collection import content_html
 import logging
 
@@ -502,16 +502,7 @@ class ECHO_navigation(Folder):
     
     def decode(self,str):
         """decoder"""
-        if not str:
-            return ""
-        if type(str) is StringType:
-	    try:            
-            	return str.decode('utf-8')
-	    except:
-		return str.decode('latin-1')
-        else:
-            
-            return str
+        return unicodify(str)
 
     def ECHOFormatListStr(self,list,search="\n",replace="<br>"):
         """formatiert liste im str"""
@@ -636,7 +627,7 @@ class ECHO_navigation(Folder):
         obj=objtemp      
         
         for keys in obj.ZopeFind(obj,obj_metatypes=self.displayedMetaTypes):
-        
+
             x=keys[1]
             if depth>1:
                 nav[x.getId()]=(self.getColls(x,int(depth)-1,checkOnly),x)
@@ -906,7 +897,7 @@ class ECHO_navigation(Folder):
         """Zweite Ordnung Navigationselemente"""
         
         hash=self.createNavHash(2,checkOnly="no")
-       
+
         actual_url=self.REQUEST['URL']
         
         ult_temp=re.sub(self.absolute_url(),"",actual_url)