Index: branches/unlabeled/unlabeled-1.101.2/kernel/parser.php
===================================================================
diff -u -r6308 -r6343
--- branches/unlabeled/unlabeled-1.101.2/kernel/parser.php	(.../parser.php)	(revision 6308)
+++ branches/unlabeled/unlabeled-1.101.2/kernel/parser.php	(.../parser.php)	(revision 6343)
@@ -1260,6 +1260,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'))
 	{
@@ -2939,6 +2947,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');
 
@@ -2966,26 +2982,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;
 }
 
 /*