Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -r2147 -r2346
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 2147)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 2346)
@@ -95,7 +95,14 @@
 		
 		//Use only implicit params passing, do not set into APP
 //		$this->Set($params); // set other params as application vars
-		return str_replace('&', '&', $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
+		{
+			return $this->Application->HREF($t,$prefix,$params,$index_file);
+		}
 	}
 	
 	function Link($params)
@@ -106,6 +113,9 @@
 		}
 		if (!isset($params['pass']) && !isset($params['no_pass'])) $params['pass'] = 'm';
 		if (isset($params['no_pass'])) unset($params['no_pass']);
+		
+		if( $this->Application->GetVar('admin') ) $params['admin'] = 1;
+		
 		return $this->T($params);
 	}