--- ECHO_content/ECHO_collection.py	2005/07/20 11:30:28	1.228
+++ ECHO_content/ECHO_collection.py	2005/07/20 11:49:05	1.229
@@ -1457,9 +1457,9 @@ class ECHO_link(ECHO_externalLink):
 
 	def index_html(self):
 		"""standard link"""
-
-		splitted=self.link.split("?")
-		if len(splitted)>1:
+		if self.link:
+		 splitted=self.link.split("?")
+		 if len(splitted)>1:
 			params=cgi.parse_qs(splitted[1])
 
 			for x in params.keys():
@@ -1467,14 +1467,16 @@ class ECHO_link(ECHO_externalLink):
 					params[x]=params[x][0]
         
 
-		else:
+		 else:
 			params={}
 		
-		params['backLink']=self.aq_parent.absolute_url()
-
-		self.REQUEST.SESSION['_ECHOLink']=splitted[0]+"?"+urllib.urlencode(params)
+		 params['backLink']=self.aq_parent.absolute_url()
+		 params['startLink']=splitted[0]+"?"+urllib.urlencode(params)
 		
-		return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
+		
+		 return self.REQUEST.RESPONSE.redirect(splitted[0]+"?"+urllib.urlencode(params))
+		else:
+		 return ""
 
 def manage_addECHO_linkForm(self):
         """Form for external Links"""
@@ -1506,7 +1508,9 @@ class ECHO_collection(Folder, Persistent
     def localizeObjects(self):
 	    """localize all objects"""
 	    contents=self.ZopeFind(self,obj_metatypes=['ECHO_link','ECHO_mapText'])
-
+	    find=self.ZopeFind(self,obj_ids=('locale_en'))
+	    if not find:
+		self.manage_addECHO_locale("en",'','')
 	    for content in contents:
 		    if content[1].meta_type=='ECHO_link':
 			    find=content[1].ZopeFind(content[1],obj_metatypes=('ECHO_mapText'))