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');