Changeset 8633 for branches/crazyhorse/wp-admin/press-this.php

Timestamp:

08/13/2008 02:59:05 AM (18 years ago)

Author:

azaozz

Message:

Crazyhorse: some more merge cleanup

File:

• branches/crazyhorse/wp-admin/press-this.php (modified) (4 diffs)

branches/crazyhorse/wp-admin/press-this.php

@@ -290 +290 @@
     <title><?php _e('Press This') ?></title>
 
+    <script type="text/javascript" src="../wp-includes/js/tinymce/tiny_mce.js?ver=311"></script>
 <?php
     add_thickbox();
@@ -298 +299 @@
     wp_enqueue_script('editor_functions');
 
-    wp_teeny_mce();
+//  wp_teeny_mce();
 
     do_action('admin_print_styles');
@@ -304 +305 @@
     do_action('admin_head');
 ?>
-<<<<<<< .working
-<script type="text/javascript">
-    jQuery('#tags-input').hide();
-=======
     <script type="text/javascript">
     <?php if ( user_can_richedit() ) {
@@ -354 +351 @@
     jQuery('#tags-input').hide();
 
->>>>>>> .merge-right.r8619
     tag_update_quickclicks();