Index: trunk/kernel/parser.php
===================================================================
diff -u -r3124 -r3145
--- trunk/kernel/parser.php	(.../parser.php)	(revision 3124)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 3145)
@@ -39,6 +39,16 @@
     return $ret;
 }
 
+function m_BuildEnv_NEW()
+{  
+    global $m_var_list, $m_var_list_update;
+    $module_vars = Array(	'cat' => 'm_cat_id', 'p' => 'm_cat_page', 'lang' => 'm_lang',
+    						'theme' => 'm_theme', 'opener' => 'm_opener');
+    $ret = GenerateModuleEnv_NEW('m', $module_vars);
+    if( isset($GLOBALS['m_var_list_update']['cat']) ) unset($GLOBALS['m_var_list_update']['cat']);
+    return $ret;
+}
+
 function m_GetVar($name)
 {
 	// get variable from template variable's list
@@ -1231,7 +1241,7 @@
 {
 	global $objConfig, $objCatList;
   
-	$ret = $objConfig->Get("Site_Name");	
+	$ret = strip_tags( $objConfig->Get('Site_Name') );
 	if(getArrayValue($attribs,'_fullpath') || getArrayValue($attribs,'_currentcategory'))
 	{
 		$CurrentCat = $objCatList->CurrentCategoryID();