Changeset 9ab7bc6 in github


Ignore:
Timestamp:
Sep 13, 2009 3:48:22 AM (4 years ago)
Author:
alecpl <alec@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
7fec6b2
Parents:
0f6e0e1d
Message:
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    r59395e7 r9ab7bc6  
    22=========================== 
    33 
     4- Added 'html_editor' hook (#1486068) 
    45- Fix DB constraint violation when populating messages cache (#1486052) 
    56- Password: added password strength options (#1486062) 
  • program/include/main.inc

    r7596968 r9ab7bc6  
    13791379function rcube_html_editor($mode='') 
    13801380{ 
    1381   global $OUTPUT, $CONFIG; 
    1382  
    1383   $lang = $tinylang = strtolower(substr($_SESSION['language'], 0, 2)); 
    1384   if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$tinylang.'.js')) 
    1385     $tinylang = 'en'; 
    1386  
    1387   $OUTPUT->include_script('tiny_mce/tiny_mce.js'); 
    1388   $OUTPUT->include_script('editor.js'); 
    1389   $OUTPUT->add_script('rcmail_editor_init("$__skin_path", "'.JQ($tinylang).'", '.intval($CONFIG['enable_spellcheck']).', "'.$mode.'");'); 
    1390 } 
    1391  
     1381  global $RCMAIL, $CONFIG; 
     1382 
     1383  $lang = strtolower(substr($_SESSION['language'], 0, 2)); 
     1384  if (!file_exists(INSTALL_PATH . 'program/js/tiny_mce/langs/'.$lang.'.js')) 
     1385    $lang = 'en'; 
     1386 
     1387  $hook = $RCMAIL->plugins->exec_hook('hmtl_editor', array('abort' => false, 
     1388    'mode' => $mode, 'lang' => $lang)); 
     1389 
     1390  if ($hook['abort']) 
     1391    return;   
     1392 
     1393  $RCMAIL->output->include_script('tiny_mce/tiny_mce.js'); 
     1394  $RCMAIL->output->include_script('editor.js'); 
     1395  $RCMAIL->output->add_script('rcmail_editor_init("$__skin_path", 
     1396    "'.JQ($hook['lang']).'", '.intval($CONFIG['enable_spellcheck']).', "'.$hook['mode'].'");'); 
     1397} 
    13921398 
    13931399 
Note: See TracChangeset for help on using the changeset viewer.