WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / class-wp-press-this.php

diff --git a/wp-admin/includes/class-wp-press-this.php b/wp-admin/includes/class-wp-press-this.php
index a00bbaa40e7e7ff142f4437c51dd052b864e3ae3..71ce5153d3a18b9b15d004ea431fe3eed04ee650 100644 (file)
--- a/wp-admin/includes/class-wp-press-this.php
+++ b/wp-admin/includes/class-wp-press-this.php
@@ -13,8 +13,8 @@
  * @since 4.2.0
  */
 class WP_Press_This {
  * @since 4.2.0
  */
 class WP_Press_This {

-

        // Used to trigger the bookmarklet update notice.
        // Used to trigger the bookmarklet update notice.

+       const VERSION = 8;

        public $version = 8;
 
        private $images = array();
        public $version = 8;
 
        private $images = array();


@@ -267,8 +267,6 @@ class WP_Press_This {
         * @return string Source's HTML sanitized markup
         */
        public function fetch_source_html( $url ) {
         * @return string Source's HTML sanitized markup
         */
        public function fetch_source_html( $url ) {

-               global $wp_version;
-

                if ( empty( $url ) ) {
                        return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
                }
                if ( empty( $url ) ) {
                        return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
                }


@@ -276,7 +274,7 @@ class WP_Press_This {
                $remote_url = wp_safe_remote_get( $url, array(
                        'timeout' => 30,
                        // Use an explicit user-agent for Press This
                $remote_url = wp_safe_remote_get( $url, array(
                        'timeout' => 30,
                        // Use an explicit user-agent for Press This

-                       'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
+                       'user-agent' => 'Press This (WordPress/' . get_bloginfo( 'version' ) . '); ' . get_bloginfo( 'url' )

                ) );
 
                if ( is_wp_error( $remote_url ) ) {
                ) );
 
                if ( is_wp_error( $remote_url ) ) {


@@ -479,7 +477,6 @@ class WP_Press_This {
                        // Embedded Daily Motion videos
                        $src = 'https://www.dailymotion.com/video/' . $src_matches[2];
                } else {
                        // Embedded Daily Motion videos
                        $src = 'https://www.dailymotion.com/video/' . $src_matches[2];
                } else {

-                       require_once( ABSPATH . WPINC . '/class-oembed.php' );

                        $oembed = _wp_oembed_get_object();
 
                        if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
                        $oembed = _wp_oembed_get_object();
 
                        if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {


@@ -943,7 +940,7 @@ class WP_Press_This {
 
                if ( $user_can_assign_terms ) {
                        ?>
 
                if ( $user_can_assign_terms ) {
                        ?>

-                       <button type="button" class="button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
+                       <button type="button" class="button-link tagcloud-link" id="link-post_tag" aria-expanded="false"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>

                        <?php
                }
        }
                        <?php
                }
        }


@@ -1190,11 +1187,12 @@ class WP_Press_This {
         * @access public
         *
         * @global WP_Locale $wp_locale
         * @access public
         *
         * @global WP_Locale $wp_locale

-        * @global string    $wp_version

         * @global bool      $is_IE
         */
        public function html() {
         * @global bool      $is_IE
         */
        public function html() {

-               global $wp_locale, $wp_version;
+               global $wp_locale;
+
+               $wp_version = get_bloginfo( 'version' );

 
                // Get data, new (POST) and old (GET).
                $data = $this->merge_or_fetch_data();
 
                // Get data, new (POST) and old (GET).
                $data = $this->merge_or_fetch_data();


@@ -1314,7 +1312,7 @@ class WP_Press_This {
        $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
        $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
        $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
        $admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
        $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
        $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );

-       $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+       $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );

 
        /** This filter is documented in wp-admin/admin-header.php */
        $admin_body_classes = apply_filters( 'admin_body_class', '' );
 
        /** This filter is documented in wp-admin/admin-header.php */
        $admin_body_classes = apply_filters( 'admin_body_class', '' );


@@ -1517,9 +1515,3 @@ class WP_Press_This {
                die();
        }
 }
                die();
        }
 }

-
-/**
- *
- * @global WP_Press_This $wp_press_this
- */
-$GLOBALS['wp_press_this'] = new WP_Press_This;