Changes from branches/2.8/wp-admin/press-this.php at r12170 to trunk/wp-admin/press-this.php at r11383

File:

• trunk/wp-admin/press-this.php (modified) (3 diffs)

trunk/wp-admin/press-this.php

@@ -92 +92 @@
 
 // Set Variables
-$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
-$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
+$title = isset($_GET['t']) ? esc_html(aposfix(stripslashes($_GET['t']))) : '';
+$selection = isset($_GET['s']) ? trim( aposfix( stripslashes($_GET['s']) ) ) : '';
 if ( ! empty($selection) ) {
     $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
@@ -118 +118 @@
         <h2><label for="embed-code"><?php _e('Embed Code') ?></label></h2>
         <div class="inside">
-            <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo wp_htmledit_pre( $selection ); ?></textarea>
+            <textarea name="embed-code" id="embed-code" rows="8" cols="40"><?php echo format_to_edit($selection, true); ?></textarea>
             <p id="options"><a href="#" class="select button"><?php _e('Insert Video'); ?></a> <a href="#" class="close button"><?php _e('Cancel'); ?></a></p>
         </div>
@@ -549 +549 @@
             <div class="editor-container">
                 <textarea name="content" id="content" style="width:100%;" class="mceEditor" rows="15">
-                    <?php if ($selection) echo wp_richedit_pre( $selection ); ?>
-                    <?php if ($url) { echo '<p>'; if($selection) _e('via '); printf( "<a href='%s'>%s</a>.", esc_url( $url ), esc_html( $title ) ); echo '</p>'; } ?>
+                    <?php if ($selection) echo wp_richedit_pre(htmlspecialchars_decode($selection)); ?>
+                    <?php if ($url) { echo '<p>'; if($selection) _e('via '); echo "<a href='$url'>$title</a>."; echo '</p>'; } ?>
                 </textarea>
             </div>