Index: branches/5.0.x/core/units/form_submissions/form_submission_tp.php
===================================================================
diff -u -N
--- branches/5.0.x/core/units/form_submissions/form_submission_tp.php	(revision 0)
+++ branches/5.0.x/core/units/form_submissions/form_submission_tp.php	(revision 12716)
@@ -0,0 +1,22 @@
+<?php
+
+	class FormSubmissionTagProcessor extends kDBTagProcessor {
+
+		/**
+		 * Returns phrase translation by name
+		 *
+		 * @param Array $params
+		 * @return string
+		 * @access public
+		 */
+		function PhraseFromRequest($params)
+		{
+			$phrase_name = $this->Application->GetVar($params['name']);
+
+			if (array_key_exists('default', $params) && !$phrase_name) {
+				$phrase_name = $params['default'];
+			}
+
+			return $this->Application->Phrase($phrase_name);
+		}
+	}
Index: branches/5.0.x/themes/advanced/platform/thankyou.tpl
===================================================================
diff -u -N -r12407 -r12716
--- branches/5.0.x/themes/advanced/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 12407)
+++ branches/5.0.x/themes/advanced/platform/thankyou.tpl	(.../thankyou.tpl)	(revision 12716)
@@ -6,7 +6,7 @@
 
 <!--## PAGE TITLE ELEMENT ##-->
 <inp2:m_DefineElement name="page_title">
-	<inp2:m_Phrase source="get" name="thankyou_header" default="lu_title_Thankyou"/>
+	<inp2:formsubs_PhraseFromRequest name="thankyou_header" default="lu_title_Thankyou"/>
 </inp2:m_DefineElement>
 <!--## //PAGE TITLE ELEMENT ##-->
 
@@ -37,10 +37,10 @@
 		<div class="movable-element">
 			<inp2:m_RenderElement design="content_box">
 				<inp2:m_Capture to_var="header">
-					<inp2:m_Phrase source="get" name="thankyou_header" default="lu_title_Thankyou"/>
+					<inp2:formsubs_PhraseFromRequest name="thankyou_header" default="lu_title_Thankyou"/>
 				</inp2:m_Capture>
 
-				<inp2:m_Phrase source="get" name="thankyou_text" default="lu_text_Thankyou"/>
+				<inp2:formsubs_PhraseFromRequest name="thankyou_text" default="lu_text_Thankyou"/>
 
 				<br /><br />
 
Index: branches/5.0.x/core/units/form_submissions/form_submissions_config.php
===================================================================
diff -u -N -r12703 -r12716
--- branches/5.0.x/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 12703)
+++ branches/5.0.x/core/units/form_submissions/form_submissions_config.php	(.../form_submissions_config.php)	(revision 12716)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: form_submissions_config.php 12703 2009-10-20 08:17:55Z alex $
+* @version	$Id: form_submissions_config.php 12716 2009-10-20 14:26:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -19,7 +19,7 @@
 					'ItemClass'			=>	Array('class'=>'kDBItem','file'=>'','build_event'=>'OnItemBuild'),
 					'ListClass'			=>	Array('class'=>'kDBList','file'=>'','build_event'=>'OnListBuild'),
 					'EventHandlerClass'	=>	Array('class'=>'FormSubmissionsEventHandler','file'=>'form_submissions_eh.php','build_event'=>'OnBuild'),
-					'TagProcessorClass' =>	Array('class'=>'kDBTagProcessor', 'file' => '', 'build_event'=>'OnBuild'),
+					'TagProcessorClass' =>	Array('class'=>'FormSubmissionTagProcessor', 'file' => 'form_submission_tp.php', 'build_event'=>'OnBuild'),
 					'AutoLoad'			=>	true,
 					'QueryString'		=>	Array(
 												1	=>	'id',
Index: branches/5.0.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r12704 -r12716
--- branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12704)
+++ branches/5.0.x/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 12716)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: main_processor.php 12704 2009-10-20 08:55:13Z alex $
+* @version	$Id: main_processor.php 12716 2009-10-20 14:26:26Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -477,15 +477,7 @@
 	 */
 	function Phrase($params)
 	{
-		// m:phrase name="phrase_name" default="Tr-alala" updated="2004-01-29 12:49"
 		$phrase_name = $this->SelectParam($params, 'label,name,title');
-		if (isset($params['source']) && $params['source']) {
-			$phrase_name = $this->Application->GetVar($phrase_name);
-			if (array_key_exists('default', $params) && !$phrase_name) {
-				$phrase_name = $params['default'];
-			}
-		}
-
 		$no_editing = array_key_exists('no_editing', $params) && $params['no_editing'];
 		$translation = $this->Application->Phrase($phrase_name, !$no_editing);