From dc00400634fdfac61f49bccce3c9a9f262135d92 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 14 Sep 2009 02:29:12 -0400
Subject: [PATCH] - simplify html_editor hook
---
program/include/main.inc | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index e79cc02..388b2a1 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -1380,20 +1380,19 @@
{
global $RCMAIL, $CONFIG;
- $lang = strtolower(substr($_SESSION['language'], 0, 2));
- if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js'))
- $lang = 'en';
-
- $hook = $RCMAIL->plugins->exec_hook('hmtl_editor', array('abort' => false,
- 'mode' => $mode, 'lang' => $lang));
+ $hook = $RCMAIL->plugins->exec_hook('hmtl_editor', array('mode' => $mode));
if ($hook['abort'])
return;
+ $lang = strtolower(substr($_SESSION['language'], 0, 2));
+ if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js'))
+ $lang = 'en';
+
$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'].'");');
+ "'.JQ($lang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");');
}
--
Gitblit v1.9.1