holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refine the logic for the application of the font span for default font settings in ckeditor (should only be applied on first load or on switch plain->html and the absence of the font_part of the span; compose as new should possibly skip that too)

Browse Source
This commit is contained in:
Klaus Leithoff 2014-03-04 15:19:48 +00:00
parent ef7c2e5faa
commit 1ae64aab58
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/inc/class.mail_compose.inc.php
View File

@ -248,6 +248,7 @@ class mail_compose
if (isset($_GET['part_id'])) $partID = $_GET['part_id'];
// Process different places we can use as a start for composing an email
$actionToProcess = 'compose';
if($_GET['from'] && $replyID)
{
$_content = array_merge((array)$_content, $this->getComposeFrom(
@ -256,6 +257,7 @@ class mail_compose
// Additionally may be changed
$_focusElement, $suppressSigOnTop, $isReply
));
$actionToProcess = $_GET['from'];
unset($_GET['from']);
unset($_GET['reply_id']);
unset($_GET['part_id']);
@ -280,7 +282,11 @@ class mail_compose
}
else
{
$isFirstLoad = true;
// as we use isFirstLoad to trigger the initalStyle on ckEditor, we
// respect that composeasnew may not want that, as we assume there
// is some style already set and our initalStyle always adds a span with  
// and we want to avoid that
$isFirstLoad = !($actionToProcess=='composeasnew');//true;
$this->composeID = $_content['composeID'] = $this->getComposeID();
if (!is_array($_content))
{