Index: branches/5.2.x/units/affiliates/affiliates_tag_processor.php
===================================================================
diff -u -N -r14258 -r14582
--- branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14258)
+++ branches/5.2.x/units/affiliates/affiliates_tag_processor.php	(.../affiliates_tag_processor.php)	(revision 14582)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: affiliates_tag_processor.php 14258 2011-03-16 21:43:52Z alex $
+* @version	$Id: affiliates_tag_processor.php 14582 2011-09-23 14:42:51Z alex $
 * @package	In-Commerce
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license	Commercial License
@@ -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=(.*)&amp;(.*)/', '\\1/index.php?\\3', $link);
+			// remove env manually
+			return preg_replace('/(.*)\/index.php\?env=(.*?)&amp;(.*)/', '\\1/index.php?\\3', $link);
 		}
 
 		/**
@@ -50,16 +49,15 @@
 
 //			return $this->GetAffiliateLink($params);
 
-			$params['no_pass'] = 1; // don't work
 			$params['index_file'] = 'index.php';
 			$params['affiliate'] = $object->GetDBField('AffiliateCode');
 			$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=(.*)&amp;(.*)/', '\\1/index.php?\\3', $link);
+			// remove env manually
+			return preg_replace('/(.*)\/index.php\?env=(.*?)&amp;(.*)/', '\\1/index.php?\\3', $link);
 		}
 
 		/**