Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r8374 -r8397
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8374)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 8397)
@@ -139,24 +139,9 @@
 
 	function FormAction($params)
 	{
-		$pass_category = true;
-		$category_id = $this->Application->GetVar('m_cat_id');
-
-		if ($category_id > 0) {
-			$category = $this->Application->recallObject('c');
-			/* @var $category kDBItem */
-
-			$t = $this->Application->GetVar('t');
-			if (preg_match('/Content\/'.preg_quote($t, '/').'/i', $category->GetDBField('NamedParentPath'))) {
-				// category name matches template name -> Proj-CMS/In-Edit tricks
-				$pass_category = false;
-			}
-		}
-
 		$params['pass'] = 'all,m';
-		if ($pass_category) {
-			$params['pass_category'] = 1;
-		}
+		$params['pass_category'] = 1;
+		
 		return $this->Application->HREF('', '', $params);
 	}
 
@@ -459,9 +444,9 @@
 		// m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49"
 		if (array_key_exists('default', $params)) return $params['default']; //backward compatibility
 		$translation = $this->Application->Phrase($this->SelectParam($params, 'label,name,title'));
+		
 		if (getArrayValue($params, 'escape')) {
-			$translation = htmlspecialchars($translation);
-			$translation = str_replace('\'', ''', $translation);
+			$translation = htmlspecialchars($translation, ENT_QUOTES);
 			$translation = addslashes($translation);
 		}
 		return $translation;
@@ -597,7 +582,7 @@
 				$res = '';
 			}
 		}
-			
+
 		$this->Application->Parser =& $parser;
 		$this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists;