Ticket #31485: 31485.2.diff

wp-admin/css/edit.css

@@ -1063 +1063 @@
   13.0 - Tags
 ------------------------------------------------------------------------------*/
 
-.tagsdiv {
-        margin-top: -8px;
-}
 
-#poststuff .taghint {
-        color: #aaa;
-        margin: 15px 0 -24px 12px;
-}
-
 #poststuff .tagsdiv .howto {
         margin: 0 0 6px 0;
 }
@@ -1096 +1088 @@
         margin: 0 5px;
 }
 
-/* tag hints */
-.taghint {
-        color: #aaa;
-        margin: -17px 0 0 7px;
-        visibility: hidden;
-}
 
-input.newtag ~ div.taghint {
-        visibility: visible;
-}
-
-input.newtag:focus ~ div.taghint {
-        visibility: hidden;
-}
-
 p.popular-tags {
         border: none;
         line-height: 2em;

wp-admin/css/press-this.css

@@ -258 +258 @@
         display: none;
 }
 
-.screen-reader-text,
-.taghint {
+.screen-reader-text {
         position: absolute;
         margin: -1px;
         padding: 0;

wp-admin/includes/class-wp-press-this.php

@@ -31 +31 @@
          * @return array Site settings.
          */
         public function site_settings() {
-                $default_html = array(
-                        'quote' => '<blockquote>%1$s</blockquote>',
-                        'link' => '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
-                                ' <em><a href="%1$s">%2$s</a></em></p>',
-                );
-
                 return array(
                         // Used to trigger the bookmarklet update notice.
                         // Needs to be set here and in get_shortcut_link() in wp-includes/link-template.php.
@@ -47 +41 @@
                          *
                          * @since 4.2.0
                          *
-                         * @param bool false Whether to redirect in parent window or not. Default false.
+                         * @param bool $redir_in_parent Whether to redirect in parent window or not. Default false.
                          */
-                        'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
-
-                        /**
-                         * Filter the default HTML for the Press This editor.
-                         *
-                         * @since 4.2.0
-                         *
-                         * @param array $default_html Associative array with two keys: 'quote' where %1$s is replaced with the site description
-                         *                            or the selected content, and 'link' there %1$s is link href, %2$s is link text.
-                         */
-                        'html' => apply_filters( 'press_this_suggested_html', $default_html ),
+                        'redir_in_parent' => apply_filters( 'press_this_redirect_in_parent', false ),
                 );
         }
 
         /**
-         * Get the source's images and save them locally, for posterity, unless we can't.
+         * Get the sources images and save them locally, fr posterity, unless we can't.
          *
          * @since 4.2.0
          * @access public
@@ -644 +628 @@
                                 ?>
                                 <div class="ajaxtag hide-if-no-js">
                                         <label class="screen-reader-text" for="new-tag-post_tag"><?php _e( 'Tags' ); ?></label>
-                                        <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
                                         <p>
                                                 <input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
                                                 <button type="button" class="button tagadd"><?php _e( 'Add' ); ?></button>
@@ -727 +710 @@
                 $post = get_default_post_to_edit( 'post', true );
                 $post_ID = (int) $post->ID;
 
-                wp_enqueue_media( array( 'post' => $post_ID ) );
                 wp_enqueue_style( 'press-this' );
                 wp_enqueue_script( 'press-this' );
                 wp_enqueue_script( 'json2' );
+                wp_enqueue_media( array( 'post' => $post->ID ) );
                 wp_enqueue_script( 'editor' );
 
                 $supports_formats = false;
@@ -739 +722 @@
                 if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
                         $supports_formats = true;
 
-                        if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
+                        if ( ! ( $post_format = get_post_format( $post->ID ) ) ) {
                                 $post_format = 0;
                         }
                 }
@@ -798 +781 @@
         </div>
 
         <form id="pressthis-form" name="pressthis-form" method="POST" autocomplete="off">
-                <input type="hidden" name="post_ID" id="post_ID" value="<?php echo $post_ID; ?>" />
+                <input type="hidden" name="post_ID" id="post_ID" value="<?php echo esc_attr( $post_ID ); ?>" />
                 <input type="hidden" name="action" value="press-this-save-post" />
                 <input type="hidden" name="post_status" id="post_status" value="draft" />
                 <?php

wp-admin/includes/meta-boxes.php

@@ -418 +418 @@
         <?php if ( $user_can_assign_terms ) : ?>
         <div class="ajaxtag hide-if-no-js">
                 <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
-                <div class="taghint"><?php echo $taxonomy->labels->add_new_item; ?></div>
                 <p><input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="" />
                 <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" /></p>
         </div>

wp-admin/js/tags-box.js

@@ -158 +158 @@
                                 t.flushTags( $(this).closest('.tagsdiv') );
                         });
 
-                        $('div.taghint', ajaxtag).click(function(){
-                                $(this).css('visibility', 'hidden').parent().siblings('.newtag').focus();
-                        });
 
-                        $('input.newtag', ajaxtag).blur(function() {
-                                if ( '' === this.value )
-                                        $(this).parent().siblings('.taghint').css('visibility', '');
-                        }).focus(function(){
-                                $(this).parent().siblings('.taghint').css('visibility', 'hidden');
-                        }).keyup(function(e){
+                        $('input.newtag', ajaxtag).keyup(function(e){
                                 if ( 13 == e.which ) {
                                         tagBox.flushTags( $(this).closest('.tagsdiv') );
                                         return false;