Index: trunk/kernel/parser.php
===================================================================
diff -u -r6093 -r6428
--- trunk/kernel/parser.php	(.../parser.php)	(revision 6093)
+++ trunk/kernel/parser.php	(.../parser.php)	(revision 6428)
@@ -44,7 +44,14 @@
     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');
+    $pass_cat = 0;
+    if (isset($m_var_list_update['cat'])) {
+    	$pass_cat = 1;
+    }
     $ret = GenerateModuleEnv_NEW('m', $module_vars);
+    if ($pass_cat) {
+    	$ret['pass_category'] = 1;
+    }
     if( isset($GLOBALS['m_var_list_update']['cat']) ) unset($GLOBALS['m_var_list_update']['cat']);
     return $ret;
 }
@@ -1254,6 +1261,14 @@
 {
 	global $objConfig, $objCatList;
 
+	$application =& kApplication::Instance();
+	if ($application->isModuleEnabled('In-Edit')) {
+		$title = $application->ProcessTag('cms:PageInfo type="htmlhead_title"');
+		if ($title && !preg_match('/^_Auto.*/', $title)) {
+			return $title;
+		}
+	}
+
 	$ret = strip_tags( $objConfig->Get('Site_Name') );
 	if(getArrayValue($attribs,'_fullpath') || getArrayValue($attribs,'_currentcategory'))
 	{
@@ -2933,6 +2948,14 @@
 {
     global $objCatList, $objConfig;
 
+    $application =& kApplication::Instance();
+		if ($application->isModuleEnabled('In-Edit')) {
+			$keywords = $application->ProcessTag('cms:PageInfo type="meta_keywords"');
+			if ($keywords) {
+				return $keywords;
+			}
+		}
+
     $keywords = '';
     $catid = (int)getArrayValue($attribs, '_catid');
 
@@ -2960,26 +2983,34 @@
 */
 function m_meta_description($attribs = array())
 {
-    global $objCatList, $objConfig;
+	global $objCatList, $objConfig;
 
+	$application =& kApplication::Instance();
+	if ($application->isModuleEnabled('In-Edit')) {
+		$description = $application->ProcessTag('cms:PageInfo type="meta_description"');
+		if ($description) {
+			return $description;
+		}
+	}
+
 	$description = '';
-    $catid = (int)getArrayValue($attribs, '_catid');
-    if (!$catid)
-    {
+	$catid = (int)getArrayValue($attribs, '_catid');
+	if (!$catid)
+	{
 		$catid = $objCatList->CurrentCategoryID();
-    }
+	}
 
-    if ($catid)
-    {
-        $c = $objCatList->GetItem($catid);
-        $description = $c->Get('MetaDescription');
-    }
+	if ($catid)
+	{
+		$c = $objCatList->GetItem($catid);
+		$description = $c->Get('MetaDescription');
+	}
 
-    if (!$description)
-    {
-        $description = $objConfig->Get('Category_MetaDesc');
-    }
-    return $description;
+	if (!$description)
+	{
+		$description = $objConfig->Get('Category_MetaDesc');
+	}
+	return $description;
 }
 
 /*