merging 6.2.8 changes and initial draft of TinyMCE as rich editor
This commit is contained in:
parent
a189f52942
commit
6ddb7c49e6
38 changed files with 328 additions and 145 deletions
|
|
@ -16,7 +16,7 @@ use WebGUI::URL;
|
|||
|
||||
#-------------------------------------------------------------------
|
||||
sub process {
|
||||
return WebGUI::URL::page();
|
||||
return WebGUI::URL::getScriptURL().$session{page}{urlizedTitle};
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ sub process {
|
|||
my @param = WebGUI::Macro::getParams($_[0]);
|
||||
my $templateId = $param[2] || 1;
|
||||
my %var;
|
||||
$var{'user.isVisitor'} = ($session{user}{userId} == 1);
|
||||
$var{'user.isVisitor'} = ($session{user}{userId} eq "1");
|
||||
$var{'customText'} = $param[1];
|
||||
$var{'customText'} =~ s/%(.*?)%/_createURL($1)/ge;
|
||||
$var{'hello.label'} = WebGUI::International::get(48);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue