Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r6093 -r6428
--- trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 6093)
+++ trunk/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 6428)
@@ -121,7 +121,7 @@
function FormAction($params)
{
- return $this->Application->ProcessParsedTag('m', 't', array_merge($params, Array('pass'=>'all,m' )) );
+ return $this->Application->ProcessParsedTag('m', 't', array_merge($params, Array('pass'=>'all,m', 'pass_category' => 1 )) );
}
/*// NEEDS TEST
@@ -375,6 +375,9 @@
else {
$o .= "\n";
}
+ if ($this->Application->GetVar('admin') == 1) {
+ $o .= "\n";
+ }
return $o;
}
@@ -522,7 +525,7 @@
if (!$t) {
trigger_error('Template name not specified in <inp2:m_include .../> tag', E_USER_ERROR);
}
-
+
$res = $BlockParser->ParseTemplate( $t, 1, $params, isset($params['is_silent']) ? 1 : 0 );
if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) {
@@ -895,11 +898,21 @@
function XMLTemplate($params)
{
- define('DBG_SKIP_REPORTING', 1);
+ safeDefine('DBG_SKIP_REPORTING', 1);
$lang =& $this->Application->recallObject('lang.current');
header('Content-type: text/xml; charset='.$lang->GetDBField('Charset'));
}
+ function Header($params)
+ {
+ header($params['data']);
+ }
+
+ function NoDebug($params)
+ {
+ define('DBG_SKIP_REPORTING', 1);
+ }
+
function RootCategoryName($params)
{
$root_phrase = $this->Application->ConfigValue('Root_Name');