Index: trunk/core/kernel/application.php
===================================================================
diff -u -r3456 -r3477
--- trunk/core/kernel/application.php	(.../application.php)	(revision 3456)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 3477)
@@ -845,6 +845,12 @@
 			unset($params['anchor']);
 		}
 
+		if ( isset($params['no_amp']) )
+		{
+			$params['__URLENCODE__'] = $params['no_amp'];
+			unset($params['no_amp']);
+		}
+		
 		if ($this->RewriteURLs($ssl))
 		{
 			$session =& $this->recallObject('Session');
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -r3344 -r3477
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3344)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3477)
@@ -84,15 +84,17 @@
 		$prefix=isset($params['prefix']) ? $params['prefix'] : ''; unset($params['prefix']);
 		$index_file = isset($params['index_file']) ? $params['index_file'] : null; unset($params['index_file']);
 
-		if( !getArrayValue($params,'no_amp') )
+		return $this->Application->HREF($t,$prefix,$params,$index_file);
+		
+		/*if( !getArrayValue($params,'no_amp') )
 		{
 			return str_replace('&', '&', $this->Application->HREF($t,$prefix,$params,$index_file));
 		}
 		else
 		{
 			unset($params['no_amp']);
 			return $this->Application->HREF($t,$prefix,$params,$index_file);
-		}
+		}*/
 	}
 
 	function Link($params)