mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-30 19:30:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #3333 from SimSync/wysiwyg2

Browse Source 
A new approach to choose wysiwyg editor
This commit is contained in:
Cameron
2018-08-02 14:07:54 -07:00
committed by GitHub
parent 472fdd4f65 e54be60012
commit 367498b598
8 changed files with 102 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_plugins/forum/forum_admin.php
View File

@@ -232,12 +232,11 @@ if(!deftrue('OLD_FORUMADMIN'))
$this->prefs['editor']['writeParms']['optArray']['default'] = FORLAN_217;
$this->prefs['editor']['writeParms']['optArray']['bbcode'] = 'BBCode';
//@ global pref should override plugins due to security considerations and allowance of posting html.
/*
if (e107::isInstalled('tinymce4'))
$editors = e107::getPlug()->getInstalledWysiwygEditors();
if (!empty($editors))
{
$this->prefs['editor']['writeParms']['optArray']['tinymce4'] = 'TinyMCE';
}*/
$this->prefs['editor']['writeParms']['optArray'] = array_merge($this->prefs['editor']['writeParms']['optArray'], $editors);
}
$this->prefs['quickreply']['writeParms']['optArray'] = array(
'default' => FORLAN_218,