Changeset 8623

Show
Ignore:
Timestamp:
08/12/08 18:18:00 (3 months ago)
Author:
azaozz
Message:

Crazyhorse: merge cleanup (editor)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/crazyhorse/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html

    r8620 r8623  
    88<script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script> 
    99 
    10 <<<<<<< .working 
    11 <link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" /> 
    1210<link rel="stylesheet" href="css/media26.css?ver=2.6" type="text/css" media="all" /> 
    13 ======= 
    1411<link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" /> 
    15 <link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" type="text/css" media="all" /> 
    16 >>>>>>> .merge-right.r8619 
     12 
    1713<script type="text/javascript"> 
    1814if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') ) 

  • branches/crazyhorse/wp-includes/js/tinymce/tiny_mce_config.php

    r8620 r8623  
    216216if ( $disk_cache ) { 
    217217 
    218 <<<<<<< .working 
    219     $cacheKey = apply_filters('tiny_mce_version', '20080723'); 
    220 ======= 
    221218    $cacheKey = apply_filters('tiny_mce_version', '20080731'); 
    222 >>>>>>> .merge-right.r8619 
    223219 
    224220    foreach ( $initArray as $v ) 

  • branches/crazyhorse/wp-includes/script-loader.php

    r8620 r8623  
    3838 
    3939    // Modify this version when tinyMCE plugins are changed. 
    40 <<<<<<< .working 
    41     $mce_version = apply_filters('tiny_mce_version', '20080723'); 
    42 ======= 
    4340    $mce_version = apply_filters('tiny_mce_version', '20080730'); 
    44 >>>>>>> .merge-right.r8619 
    4541    $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version ); 
    4642