Changeset 31597

Timestamp:

03/02/2015 12:57:34 AM (12 years ago)

Author:

azaozz

Message:

PressThis: make sure buttons.css is loaded before press-this.css. Use (int) $post_ID instead of $post->ID.
See #31373.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-press-this.php (modified) (3 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -724 +724 @@
                 $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' );
 
@@ -736 +736 @@
                         $supports_formats = true;
 
-                        if ( ! ( $post_format = get_post_format( $post->ID ) ) ) {
+                        if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
                                 $post_format = 0;
                         }
@@ -795 +795 @@
 
         <form id="pressthis-form" name="pressthis-form" method="POST" autocomplete="off">
-                <input type="hidden" name="post_ID" id="post_ID" value="<?php echo esc_attr( $post_ID ); ?>" />
+                <input type="hidden" name="post_ID" id="post_ID" value="<?php echo $post_ID; ?>" />
                 <input type="hidden" name="action" value="press-this-save-post" />
                 <input type="hidden" name="post_status" id="post_status" value="draft" />

trunk/src/wp-includes/script-loader.php

@@ -654 +654 @@
         $styles->add( 'customize-controls', "/wp-admin/css/customize-controls$suffix.css", array( 'wp-admin', 'colors', 'ie', 'imgareaselect' ) );
         $styles->add( 'customize-widgets',  "/wp-admin/css/customize-widgets$suffix.css", array( 'wp-admin', 'colors' ) );
-        $styles->add( 'press-this',         "/wp-admin/css/press-this$suffix.css", array( 'open-sans' ) );
+        $styles->add( 'press-this',         "/wp-admin/css/press-this$suffix.css", array( 'open-sans', 'buttons' ) );
 
         $styles->add( 'ie',                 "/wp-admin/css/ie$suffix.css" );