Index: trunk/core/kernel/application.php
===================================================================
diff -u -N -r3287 -r3310
--- trunk/core/kernel/application.php	(.../application.php)	(revision 3287)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 3310)
@@ -372,7 +372,7 @@
 		$this->registerClass('Template', KERNEL_PATH.'/parser/template.php');
 		$this->registerClass('TemplateParser', KERNEL_PATH.'/parser/template_parser.php');
 
-		$this->registerClass('MainProcessor', KERNEL_PATH.'/processors/main_processor.php','m_TagProcessor');
+		$this->registerClass('kMainTagProcessor', KERNEL_PATH.'/processors/main_processor.php','m_TagProcessor');
 
 		$this->registerClass('kMultipleFilter', KERNEL_PATH.'/utility/filters.php');
 		$this->registerClass('kDBList', KERNEL_PATH.'/db/dblist.php');
@@ -781,7 +781,7 @@
 	*/
 	function HREF($t, $prefix='', $params=null, $index_file=null)
 	{
-		if(!$t) $t = $this->GetVar('t'); // moved from MainProcessor->T()
+		if(!$t) $t = $this->GetVar('t'); // moved from kMainTagProcessor->T()
 
 		if( substr($t, -4) == '.tpl' ) $t = substr($t, 0, strlen($t) - 4 );
 
Index: trunk/core/kernel/parser/construct_tags.php
===================================================================
diff -u -N -r2596 -r3310
--- trunk/core/kernel/parser/construct_tags.php	(.../construct_tags.php)	(revision 2596)
+++ trunk/core/kernel/parser/construct_tags.php	(.../construct_tags.php)	(revision 3310)
@@ -202,6 +202,7 @@
 			if (defined('EXPERIMENTAL_PRE_PARSE')) {
 				$code = $this->Parser->GetCode();
 				array_unshift($code, '$o = \'\';');
+				array_unshift($code, '$application->Parser->Params = $params;');
 				array_unshift($code, '$application =& kApplication::Instance();');
 				array_unshift($code, 'extract($params);');
 
@@ -213,7 +214,7 @@
 				$defaults .= ');';
 				array_unshift($code, '$params = array_merge_recursive2($defaults, $params);');
 				array_unshift($code, $defaults);
-
+				
 				$code[] = 'return $o;';
 
 				global $debugger;
Index: trunk/core/units/general/general_config.php
===================================================================
diff -u -N -r3154 -r3310
--- trunk/core/units/general/general_config.php	(.../general_config.php)	(revision 3154)
+++ trunk/core/units/general/general_config.php	(.../general_config.php)	(revision 3310)
@@ -3,7 +3,7 @@
 $config	=	Array(
 					'Prefix'			=>	'm',
 					'EventHandlerClass'	=>	Array('class' => 'MainEventHandler', 'file' => 'main_event_handler.php', 'build_event' => 'OnBuild'),
-					/*'TagProcessorClass' =>	Array('class'=>'MainProcessor','file'=>'','build_event'=>'OnBuild'),*/
+					/*'TagProcessorClass' =>	Array('class'=>'kMainTagProcessor','file'=>'','build_event'=>'OnBuild'),*/
 					
 					'QueryString'		=>	Array(
 												1	=>	'cat_id',
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql
===================================================================
diff -u -N -r3236 -r3310
--- trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql	(.../inportal_upgrade_v1.1.4.sql)	(revision 3236)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.4.sql	(.../inportal_upgrade_v1.1.4.sql)	(revision 3310)
@@ -8,9 +8,8 @@
 INSERT INTO ConfigurationAdmin VALUES ('UseModRewrite', 'la_Text_Website', 'la_config_use_modrewrite', 'checkbox', '', '', 14, 1);
 INSERT INTO ConfigurationAdmin VALUES ('ErrorTemplate', 'la_Text_Website', 'la_config_error_template', 'text', '', '', 15, 0);
 
+ALTER TABLE Phrase CHANGE Translation Translation TEXT NOT NULL;
 
-
-
 ALTER TABLE Category ADD Filename varchar(255) NOT NULL AFTER Name;
 ALTER TABLE Category ADD AutomaticFilename TINYINT UNSIGNED NOT NULL AFTER Filename ;
 ALTER TABLE Category ADD NamedParentPath TEXT NOT NULL AFTER ParentPath;
Index: trunk/admin/install/inportal_schema.sql
===================================================================
diff -u -N -r3195 -r3310
--- trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 3195)
+++ trunk/admin/install/inportal_schema.sql	(.../inportal_schema.sql)	(revision 3310)
@@ -342,7 +342,7 @@
 
 CREATE TABLE Phrase (
   Phrase varchar(255) NOT NULL default '',
-  Translation varchar(255) NOT NULL default '',
+  Translation text NOT NULL default '',
   PhraseType int(11) NOT NULL default '0',
   PhraseId int(11) NOT NULL auto_increment,
   LanguageId int(11) NOT NULL default '0',
Index: trunk/kernel/units/general/general_config.php
===================================================================
diff -u -N -r3154 -r3310
--- trunk/kernel/units/general/general_config.php	(.../general_config.php)	(revision 3154)
+++ trunk/kernel/units/general/general_config.php	(.../general_config.php)	(revision 3310)
@@ -3,7 +3,7 @@
 $config	=	Array(
 					'Prefix'			=>	'm',
 					'EventHandlerClass'	=>	Array('class' => 'MainEventHandler', 'file' => 'main_event_handler.php', 'build_event' => 'OnBuild'),
-					/*'TagProcessorClass' =>	Array('class'=>'MainProcessor','file'=>'','build_event'=>'OnBuild'),*/
+					/*'TagProcessorClass' =>	Array('class'=>'kMainTagProcessor','file'=>'','build_event'=>'OnBuild'),*/
 					
 					'QueryString'		=>	Array(
 												1	=>	'cat_id',
Index: trunk/kernel/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r3299 -r3310
--- trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 3299)
+++ trunk/kernel/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 3310)
@@ -136,12 +136,14 @@
 	</tr>
 <inp2:m_blockend/>
 
-<inp2:m_block name="inp_edit_textarea" class=""/>
+<inp2:m_block name="inp_edit_textarea" class="" allow_html="allow_html"/>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<td class="text" valign="top">
 			<span class="<inp2:m_if prefix="$prefix" function="HasError" field="$field"/>error<inp2:m_endif/>">
 			<inp2:m_phrase label="$title"/><inp2:m_if prefix="$prefix" function="IsRequired" field="$field"/><span class="error"> *</span><inp2:m_endif/>:</span><br>
-			<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
+			<inp2:m_if check="m_ParamEquals" name="allow_html" value="allow_html">
+				<a href="javascript:OpenEditor('&section=in-link:editlink_general','kernel_form','<inp2:$prefix_InputName field="$field"/>');"><img src="img/icons/icon24_link_editor.gif" style="cursor:hand" border="0"></a>
+			</inp2:m_if>
 		</td>
 		<td>
 			<textarea tabindex="<inp2:m_get param="tab_index"/>" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" class="<inp2:m_param name="class"/>"><inp2:$prefix_Field field="$field"/></textarea>
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r3282 -r3310
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3282)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 3310)
@@ -1,6 +1,6 @@
 <?php
 
-class MainProcessor extends TagProcessor {
+class kMainTagProcessor extends TagProcessor {
 
 	function Init($prefix,$special)
 	{
Index: trunk/kernel/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r2210 -r3310
--- trunk/kernel/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 2210)
+++ trunk/kernel/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 3310)
@@ -61,7 +61,7 @@
 		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="phrases" field="LanguageId"/>
 		<inp2:m_ParseBlock name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
 		<inp2:m_ParseBlock name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="phrases" field="Translation" title="!la_fld_Translation!" size="60"/>
+		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="90" allow_html="0"/>
 		
 		<inp2:m_ParseBlock name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
 		<inp2:m_ParseBlock name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>