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 0288ed0520a62b999e9978935d2168433e3c812b..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();


@@ -42,7 +42,7 @@ class WP_Press_This {
        public function site_settings() {
                return array(
                        /**
        public function site_settings() {
                return array(
                        /**

-                        * Filter whether or not Press This should redirect the user in the parent window upon save.
+                        * Filters whether or not Press This should redirect the user in the parent window upon save.

                         *
                         * @since 4.2.0
                         *
                         *
                         * @since 4.2.0
                         *


@@ -96,7 +96,7 @@ class WP_Press_This {
        }
 
        /**
        }
 
        /**

-        * AJAX handler for saving the post as draft or published.
+        * Ajax handler for saving the post as draft or published.

         *
         * @since 4.2.0
         * @access public
         *
         * @since 4.2.0
         * @access public


@@ -134,8 +134,9 @@ class WP_Press_This {
                $post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
 
                /**
                $post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
 
                /**

-                * Filter the post data of a Press This post before saving/updating, after
-                * side_load_images action had run.
+                * Filters the post data of a Press This post before saving/updating.
+                *
+                * The {@see 'side_load_images'} action has already run at this point.

                 *
                 * @since 4.5.0
                 *
                 *
                 * @since 4.5.0
                 *


@@ -168,7 +169,7 @@ class WP_Press_This {
                        }
 
                        /**
                        }
 
                        /**

-                        * Filter the URL to redirect to when Press This saves.
+                        * Filters the URL to redirect to when Press This saves.

                         *
                         * @since 4.2.0
                         *
                         *
                         * @since 4.2.0
                         *


@@ -188,7 +189,7 @@ class WP_Press_This {
        }
 
        /**
        }
 
        /**

-        * AJAX handler for adding a new category.
+        * Ajax handler for adding a new category.

         *
         * @since 4.2.0
         * @access public
         *
         * @since 4.2.0
         * @access public


@@ -266,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.' ) );
                }


@@ -275,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 ) ) {


@@ -478,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 ) ) ) {


@@ -690,7 +688,7 @@ class WP_Press_This {
                }
 
                /**
                }
 
                /**

-                * Filter whether to enable in-source media discovery in Press This.
+                * Filters whether to enable in-source media discovery in Press This.

                 *
                 * @since 4.2.0
                 *
                 *
                 * @since 4.2.0
                 *


@@ -765,7 +763,7 @@ class WP_Press_This {
                }
 
                /**
                }
 
                /**

-                * Filter the Press This data array.
+                * Filters the Press This data array.

                 *
                 * @since 4.2.0
                 *
                 *
                 * @since 4.2.0
                 *


@@ -793,36 +791,7 @@ class WP_Press_This {
                        $press_this = str_replace( '.css', '-rtl.css', $press_this );
                }
 
                        $press_this = str_replace( '.css', '-rtl.css', $press_this );
                }
 

-               $open_sans_font_url = '';
-
-               /* translators: If there are characters in your language that are not supported
-                * by Open Sans, translate this to 'off'. Do not translate into your own language.
-                */
-               if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
-                       $subsets = 'latin,latin-ext';
-
-                       /* translators: To add an additional Open Sans character subset specific to your language,
-                        * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
-                        */
-                       $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
-
-                       if ( 'cyrillic' == $subset ) {
-                               $subsets .= ',cyrillic,cyrillic-ext';
-                       } elseif ( 'greek' == $subset ) {
-                               $subsets .= ',greek,greek-ext';
-                       } elseif ( 'vietnamese' == $subset ) {
-                               $subsets .= ',vietnamese';
-                       }
-
-                       $query_args = array(
-                               'family' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
-                               'subset' => urlencode( $subsets ),
-                       );
-
-                       $open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
-               }
-
-               return $styles . $press_this . $open_sans_font_url;
+               return $styles . $press_this;

        }
 
        /**
        }
 
        /**


@@ -971,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
                }
        }


@@ -1171,7 +1140,7 @@ class WP_Press_This {
                }
 
                /**
                }
 
                /**

-                * Filter the default HTML tags used in the suggested content for the editor.
+                * Filters the default HTML tags used in the suggested content for the editor.

                 *
                 * The HTML strings use printf format. After filtering the content is added at the specified places with `sprintf()`.
                 *
                 *
                 * The HTML strings use printf format. After filtering the content is added at the specified places with `sprintf()`.
                 *


@@ -1218,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();


@@ -1342,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', '' );


@@ -1530,6 +1500,9 @@ class WP_Press_This {
        /** This action is documented in wp-admin/admin-footer.php */
        do_action( 'admin_footer' );
 
        /** This action is documented in wp-admin/admin-footer.php */
        do_action( 'admin_footer' );
 

+       /** This action is documented in wp-admin/admin-footer.php */
+       do_action( 'admin_print_footer_scripts-press-this.php' );
+

        /** This action is documented in wp-admin/admin-footer.php */
        do_action( 'admin_print_footer_scripts' );
 
        /** This action is documented in wp-admin/admin-footer.php */
        do_action( 'admin_print_footer_scripts' );
 


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

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