Index: affiliates_tag_processor.php
===================================================================
--- affiliates_tag_processor.php	(revision 14476)
+++ affiliates_tag_processor.php	(working copy)
@@ -27,14 +27,13 @@
 			$params['affiliate'] = $object->GetDBField('AffiliateCode');
 			$params['prefix'] = '_FRONT_END_';
 			$params['index_file'] = 'index.php';
-			$params['no_pass'] = 1; // don't work
 			$params['__SSL__'] = 0;
 			$params['__NO_SID__'] = 1; // don't work
 
 			$link = $this->Application->ProcessParsedTag('m', 'Link', $params);
 
-			// remove env manually (because no_pass parameter don't work)
-			return preg_replace('/(.*)\/index.php\?env=(.*)&(.*)/', '\\1/index.php?\\3', $link);
+			// remove env manually
+			return preg_replace('/(.*)\/index.php\?env=(.*?)&(.*)/', '\\1/index.php?\\3', $link);
 		}
 
 		/**
@@ -50,7 +49,6 @@
 
 //			return $this->GetAffiliateLink($params);
 
-			$params['no_pass'] = 1; // don't work
 			$params['index_file'] = 'index.php';
 			$params['affiliate'] = $object->GetDBField('AffiliateCode');
 			$params['__SSL__'] = 0;
@@ -58,8 +56,8 @@
 
 			$link = $this->Application->ProcessParsedTag('m', 'Link', $params);
 
-			// remove env manually (because no_pass parameter don't work)
-			return preg_replace('/(.*)\/index.php\?env=(.*)&(.*)/', '\\1/index.php?\\3', $link);
+			// remove env manually
+			return preg_replace('/(.*)\/index.php\?env=(.*?)&(.*)/', '\\1/index.php?\\3', $link);
 		}
 
 		/**