Index: trunk/core/kernel/application.php
===================================================================
diff -u -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 -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 -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 -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 -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 -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 -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 @@