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
|
|
@ -121,6 +121,9 @@ sub addEntry {
|
|||
$subject = $_[2];
|
||||
$message = $_[3];
|
||||
$url = $_[4];
|
||||
unless ($url =~ /^http/) {
|
||||
$url = WebGUI::URL::getSiteURL().$url;
|
||||
}
|
||||
$status = $_[5];
|
||||
$from = $_[6];
|
||||
if ($groupId ne "") {
|
||||
|
|
@ -183,6 +186,9 @@ sub addInternationalizedEntry {
|
|||
$userId = $_[0];
|
||||
$groupId = $_[1];
|
||||
$url = $_[2];
|
||||
unless ($url =~ /^http/) {
|
||||
$url = WebGUI::URL::getSiteURL().$url;
|
||||
}
|
||||
$internationalId = $_[3];
|
||||
$namespace = $_[4] || "WebGUI";
|
||||
$status = $_[5] || 'notice';
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue