Changes from Core WP. Added tinymce editor and other fixes

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@120 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 10 insertions, 8 deletions

diff --git a/wp-inst/wp-admin/edit-form-advanced.php b/wp-inst/wp-admin/edit-form-advanced.php
index 111f547..cab0550 100644
--- a/wp-inst/wp-admin/edit-form-advanced.php
+++ b/wp-inst/wp-admin/edit-form-advanced.php
@@ -136,21 +136,23 @@ endforeach;
 </fieldset>
 
 <fieldset id="postdiv">
-       <legend><?php _e('Post') ?></legend>
+<legend><?php _e('Post') ?></legend>
+<?php if ( !get_option('rich_editing') ) : ?>
 <?php the_quicktags(); ?>
+<script type="text/javascript">
+<!--
+edCanvas = document.getElementById('content');
+//-->
+</script>
+<?php endif; ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
-     $rows = 10;
+     $rows = 12;
  }
 ?>
-<div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div>
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div>
 </fieldset>
-<script type="text/javascript">
-<!--
-edCanvas = document.getElementById('content');
-//-->
-</script>
 
 <?php echo $form_pingback ?>
 <?php echo $form_prevstatus ?>