WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't format_to_edit TinyMCE inserts. Don't turn selection into a link. Restore editor contents when switching back to text tab. see #7261 #7220 

git-svn-id: http://svn.automattic.com/wordpress/trunk@8302 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-07-09 19:51:53 +00:00
parent e2aa6d619c
commit bcbbb70170
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/press-this.php
View File

@ -395,12 +395,17 @@ if($_REQUEST['ajax'] == 'photo') { ?>
case 'text' : case 'text' :
set_menu('text'); set_menu('text');
set_title('<?php _e('Post') ?>'); set_title('<?php _e('Post') ?>');
<?php if ($selection) { ?>
set_editor("<?php echo $selection; ?>");
<?php } else { ?>
set_editor("<a href='<?php echo $url ?>'><?php echo $title; ?></a>");
<? } ?>
return false; return false;
break; break;
case 'quote' : case 'quote' :
set_menu('quote'); set_menu('quote');
set_title('<?php _e('Quote') ?>'); set_title('<?php _e('Quote') ?>');
set_editor("<blockquote><p><?php echo format_to_edit($selection); ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?> </a> </cite> </p></blockquote>"); set_editor("<blockquote><p><?php echo $selection; ?> </p><p><cite><a href='<?php echo $url; ?>'><?php echo $title; ?> </a> </cite> </p></blockquote>");
return false; return false;
break; break;
case 'video' : case 'video' :
@ -435,8 +440,10 @@ if($_REQUEST['ajax'] == 'photo') { ?>
set_menu('photo'); set_menu('photo');
set_title('<?php _e('Post') ?>'); set_title('<?php _e('Post') ?>');
<?php if ($selection) { ?> <?php if ($selection) { ?>
set_editor("<?php echo format_to_edit($selection); ?>"); set_editor("<?php echo $selection; ?>");
<?php } ?> <?php } else { ?>
set_editor("<a href='<?php echo $url ?>'><?php echo $title; ?></a>");
<? } ?>
jQuery('#extra_fields').show(); jQuery('#extra_fields').show();
jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>'); jQuery('#extra_fields').before('<h2 id="waiting"><img src="images/loading.gif" alt="" /><?php echo js_escape( __( 'Loading...' ) ); ?></h2>');
jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>'); jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']).'/?ajax=photo&u='.attribute_escape($url); ?>');
@ -500,7 +507,7 @@ if($_REQUEST['ajax'] == 'photo') { ?>
<div class="editor_area"> <div class="editor_area">
<h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2> <h2 id="content_type"><label for="content"><?php _e('Post') ?></label></h2>
<div class="editor-container"> <div class="editor-container">
<textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { ?><a href='<?php echo $url ?>'><?php echo format_to_edit($selection) ?></a><?php } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea> <textarea name="content" id="content" style="width:100%;" class="mceEditor"><?php if ($selection) { echo wp_richedit_pre($selection); } else { ?><a href='<?php echo $url ?>'><?php echo $title; ?></a><?php } ?></textarea>
</div> </div>
</div> </div>
</div> </div>