Changeset 8623

Timestamp:

08/12/2008 06:18:00 PM (16 years ago)

Author:

azaozz

Message:

Crazyhorse: merge cleanup (editor)

Location:

branches/crazyhorse/wp-includes

Files:

• js/tinymce/plugins/wpeditimage/editimage.html (modified) (1 diff)
• js/tinymce/tiny_mce_config.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

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

@@ -8 +8 @@
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
 
-<<<<<<< .working
-<link rel="stylesheet" href="css/editimage.css?ver=311d" type="text/css" media="all" />
 <link rel="stylesheet" href="css/media26.css?ver=2.6" type="text/css" media="all" />
-=======
 <link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" type="text/css" media="all" />
->>>>>>> .merge-right.r8619
+
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )

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

@@ -216 +216 @@
 if ( $disk_cache ) {
 
-<<<<<<< .working
-    $cacheKey = apply_filters('tiny_mce_version', '20080723');
-=======
     $cacheKey = apply_filters('tiny_mce_version', '20080731');
->>>>>>> .merge-right.r8619
 
     foreach ( $initArray as $v )

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

@@ -38 +38 @@
 
     // Modify this version when tinyMCE plugins are changed.
-<<<<<<< .working
-    $mce_version = apply_filters('tiny_mce_version', '20080723');
-=======
     $mce_version = apply_filters('tiny_mce_version', '20080730');
->>>>>>> .merge-right.r8619
     $scripts->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('editor_functions'), $mce_version );