Index: branches/5.1.x/core/kernel/processors/main_processor.php =================================================================== diff -u -N -r13395 -r13545 --- branches/5.1.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 13395) +++ branches/5.1.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 13545) @@ -1,6 +1,6 @@ SelectParam($params, 't,template'); - 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']); + $template = $this->SelectParam($params, 't,template'); + $prefix = array_key_exists('prefix', $params) ? $params['prefix'] : ''; - return $this->Application->HREF($t, $prefix, $params, $index_file); + unset($params['t'], $params['template'], $params['prefix']); + + return $this->Application->HREF($template, $prefix, $params); } function Link($params) { - if (isset($params['template'])) { - $params['t'] = $params['template']; - unset($params['template']); + // pass "m" prefix, instead of "all", that is by default on Front-End + if (!array_key_exists('pass', $params)) { + $params['pass'] = 'm'; } - 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; - - if (!array_key_exists('editing_mode', $params)) { - $params['editing_mode'] = EDITING_MODE; - } - } - return $this->T($params); } @@ -699,7 +688,7 @@ $block_params['passed'] = $params['passed']; $block_params['prefix'] = 'm'; - $o.= $this->Application->ParseBlock($block_params, 1); + $o.= $this->Application->ParseBlock($block_params); } return $o; }*/ @@ -855,6 +844,7 @@ $http_query =& $this->Application->recallObject('HTTPQuery'); $pass = $http_query->getRedirectParams(); + $pass['pass_events'] = 1; // to make sure all events are passed when redirect happens if ($require) { if (PROTOCOL == 'https://') {