WP Merge

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

1 files changed, 9 insertions, 8 deletions

diff --git a/wp-inst/wp-admin/edit-form-advanced.php b/wp-inst/wp-admin/edit-form-advanced.php
index 18c3ff6..c8db328 100644
--- a/wp-inst/wp-admin/edit-form-advanced.php
+++ b/wp-inst/wp-admin/edit-form-advanced.php
@@ -7,9 +7,11 @@ $messages[3] = __('Custom field deleted.');
 <div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php endif; ?>
 
+<?php $richedit = ( 'true' != get_user_option('rich_editing') ) ? false : true; ?>
+
 <form name="post" action="post.php" method="post" id="post">
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) ||
-			isset($_GET['popupurl']) ): ?>
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || 
+            isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
 
@@ -140,7 +142,7 @@ endforeach;
   <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
 </fieldset>
 
-<fieldset id="<?php echo ( 'true' != get_user_option('rich_editing') ) ? 'postdiv' : 'postdivrich'; ?>">
+<fieldset id="<?php echo $richedit ? 'postdivrich' : 'postdiv'; ?>">
 <legend><?php _e('Post') ?></legend>
 
 <?php
@@ -149,11 +151,12 @@ endforeach;
      $rows = 12;
  }
 ?>
-<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $post->post_content ?></textarea></div>
+<?php if ( !$richedit ) the_quicktags(); ?>
+
+<div><textarea title="true" rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="2" id="content"><?php echo $richedit ? wp_richedit_pre($post->post_content) : $post->post_content; ?></textarea></div>
 </fieldset>
 
-<?php if ( 'true' != get_user_option('rich_editing') ) : ?>
-<?php the_quicktags(); ?>
+<?php if ( !$richedit ) : ?>
 <script type="text/javascript">
 <!--
 edCanvas = document.getElementById('content');
@@ -226,8 +229,6 @@ else
 <?php
 $uploading_iframe_ID = (0 == $post_ID ? $temp_ID : $post_ID);
 $uploading_iframe_src = "inline-uploading.php?action=view&amp;post=$uploading_iframe_ID";
-if ( !$attachments = $wpdb->get_results("SELECT ID FROM $wpdb->posts WHERE post_parent = '$uploading_iframe_ID'") )
-	$uploading_iframe_src = "inline-uploading.php?action=upload&amp;post=$uploading_iframe_ID";
 $uploading_iframe_src = apply_filters('uploading_iframe_src', $uploading_iframe_src);
 if ( false != $uploading_iframe_src )
 	echo '<iframe id="uploading" border="0" src="' . $uploading_iframe_src . '">' . __('This feature requires iframe support.') . '</iframe>';