1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 04:12:00 +02:00

Issue #1155, Issue #1035, and possibly related to Issue #928. These changes are precautions. Still not sure what is causing it.

This commit is contained in:
Cameron
2015-07-28 10:04:17 -07:00
parent f44c6b21c7
commit 585cae01ad
4 changed files with 24 additions and 6 deletions

View File

@@ -1395,8 +1395,18 @@ class e_form
$bbbar = '';
$help_tagid = $this->name2id($name)."--preview";
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' {$height}";
$help_tagid = $this->name2id($name)."--preview";
if(e107::wysiwyg(true) === false) // bbarea loaded, so activate wysiwyg (if enabled in preferences)
{
$options['other'] = "onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);' {$height}";
}
else
{
$options['other'] = " ".$height;
}
$counter = vartrue($options['counter'],false);
@@ -1411,7 +1421,7 @@ class e_form
$_SESSION['media_category'] = $mediaCat; // used by TinyMce.
e107::wysiwyg(true); // bbarea loaded, so activate wysiwyg (if enabled in preferences)
return $ret;