Index: trunk/core/kernel/processors/main_processor.php =================================================================== diff -u -r2676 -r2712 --- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 2676) +++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 2712) @@ -79,24 +79,14 @@ { //by default link to current template $t = $this->SelectParam($params, 't,template'); - if ($t === false) { - $t = $this->Application->GetVar('t'); - } unset($params['t']); unset($params['template']); $prefix=isset($params['prefix']) ? $params['prefix'] : ''; unset($params['prefix']); $index_file = isset($params['index_file']) ? $params['index_file'] : null; unset($params['index_file']); - - /*$pass=isset($params['pass']) ? $params['pass'] : $this->Application->GetVar('t_pass'); unset($params['pass']); - $this->Application->SetVar('t_pass', $pass); - - $pass_events = isset($params['pass_events']) && $params['pass_events'] ? 1 : 0; unset($params['pass_events']); - $this->Application->SetVar('t_pass_events', $pass_events);*/ - - //Use only implicit params passing, do not set into APP -// $this->Set($params); // set other params as application vars + if( !getArrayValue($params,'no_amp') ) { + unset($params['no_amp']); return str_replace('&', '&', $this->Application->HREF($t,$prefix,$params,$index_file)); } else