diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-13 07:48:22 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2009-09-13 07:48:22 +0000 |
| commit | bf7160c636a33b07a95f87e8e218456844c8d44b (patch) | |
| tree | 92fd83818ec6092a5fc59c3de88752df1cbc5eb0 | |
| parent | 957581590c74e8ea6822d37389b83457a80450a7 (diff) | |
- Added 'html_editor' hook (#1486068)
git-svn-id: https://svn.roundcube.net/trunk@2951 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/main.inc | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 45753a024..1b0317a0c 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,7 @@ CHANGELOG RoundCube Webmail =========================== +- Added 'html_editor' hook (#1486068) - Fix DB constraint violation when populating messages cache (#1486052) - Password: added password strength options (#1486062) - Fix LDAP partial result warning (#1485536) diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc index ce27b75de..e79cc0287 100644 --- a/roundcubemail/program/include/main.inc +++ b/roundcubemail/program/include/main.inc @@ -1378,17 +1378,23 @@ function rcmail_localize_foldername($name) */ function rcube_html_editor($mode='') { - global $OUTPUT, $CONFIG; + global $RCMAIL, $CONFIG; - $lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2)); - if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js')) - $tinylang = 'en'; + $lang = strtolower(substr($_SESSION['language'], 0, 2)); + if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js')) + $lang = 'en'; - $OUTPUT->include_script('tiny_mce/tiny_mce.js'); - $OUTPUT->include_script('editor.js'); - $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");'); -} + $hook = $RCMAIL->plugins->exec_hook('hmtl_editor', array('abort' => false, + 'mode' => $mode, 'lang' => $lang)); + if ($hook['abort']) + return; + + $RCMAIL->output->include_script('tiny_mce/tiny_mce.js'); + $RCMAIL->output->include_script('editor.js'); + $RCMAIL->output->add_script('rcmail_editor_init("$__skin_path", + "'.JQ($hook['lang']).'", '.intval($CONFIG['enable_spellcheck']).', "'.$hook['mode'].'");'); +} /** |