Changeset 2954 in subversion for trunk/roundcubemail/program/include/main.inc

Timestamp:

Sep 14, 2009 2:29:12 AM (4 years ago)

Author:

alec

Message:

• simplify html_editor hook

File:

• trunk/roundcubemail/program/include/main.inc (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1381 +1381 @@
   global $RCMAIL, $CONFIG;
 
+  $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';
 
-  $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'].'");');
+    "'.JQ($lang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");');
 }