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


@@ -119,28 +119,10 @@ class WP_Press_This {
                        'post_type'     => 'post',
                        'post_status'   => 'draft',
                        'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
                        'post_type'     => 'post',
                        'post_status'   => 'draft',
                        'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',

+                       'tax_input'     => ( ! empty( $_POST['tax_input'] ) ) ? $_POST['tax_input'] : array(),
+                       'post_category' => ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array(),

                );
 
                );
 

-               // Only accept categories if the user actually can assign
-               $category_tax = get_taxonomy( 'category' );
-               if ( current_user_can( $category_tax->cap->assign_terms ) ) {
-                       $post_data['post_category'] = ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array();
-               }
-
-               // Only accept taxonomies if the user can actually assign
-               if ( ! empty( $_POST['tax_input'] ) ) {
-                       $tax_input = $_POST['tax_input'];
-                       foreach ( $tax_input as $tax => $_ti ) {
-                               $tax_object = get_taxonomy( $tax );
-                               if ( ! $tax_object || ! current_user_can( $tax_object->cap->assign_terms ) ) {
-                                       unset( $tax_input[ $tax ] );
-                               }
-                       }
-
-                       $post_data['tax_input'] = $tax_input;
-               }
-
-               // Toggle status to pending if user cannot actually publish

                if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
                        if ( current_user_can( 'publish_posts' ) ) {
                                $post_data['post_status'] = 'publish';
                if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
                        if ( current_user_can( 'publish_posts' ) ) {
                                $post_data['post_status'] = 'publish';


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


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


@@ -473,7 +453,7 @@ class WP_Press_This {
         * @since 4.2.0
         *
         * @param string $src Embed source URL.
         * @since 4.2.0
         *
         * @param string $src Embed source URL.

-        * @return string If not from a supported provider, an empty string. Otherwise, a reformatted embed URL.
+        * @return string If not from a supported provider, an empty string. Otherwise, a reformattd embed URL.

         */
        private function _limit_embed( $src ) {
                $src = $this->_limit_url( $src );
         */
        private function _limit_embed( $src ) {
                $src = $this->_limit_url( $src );


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


@@ -874,12 +853,6 @@ class WP_Press_This {
        public function categories_html( $post ) {
                $taxonomy = get_taxonomy( 'category' );
 
        public function categories_html( $post ) {
                $taxonomy = get_taxonomy( 'category' );
 

-               // Bail if user cannot assign terms
-               if ( ! current_user_can( $taxonomy->cap->assign_terms ) ) {
-                       return;
-               }
-
-               // Only show "add" if user can edit terms

                if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
                        ?>
                        <button type="button" class="add-cat-toggle button-link" aria-expanded="false">
                if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
                        ?>
                        <button type="button" class="add-cat-toggle button-link" aria-expanded="false">


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


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


@@ -1298,12 +1272,6 @@ class WP_Press_This {
                wp_enqueue_script( 'json2' );
                wp_enqueue_script( 'editor' );
 
                wp_enqueue_script( 'json2' );
                wp_enqueue_script( 'editor' );
 

-               $categories_tax   = get_taxonomy( 'category' );
-               $show_categories  = current_user_can( $categories_tax->cap->assign_terms ) || current_user_can( $categories_tax->cap->edit_terms );
-
-               $tag_tax          = get_taxonomy( 'post_tag' );
-               $show_tags        = current_user_can( $tag_tax->cap->assign_terms );
-

                $supports_formats = false;
                $post_format      = 0;
 
                $supports_formats = false;
                $post_format      = 0;
 


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


@@ -1455,21 +1423,17 @@ class WP_Press_This {
                                        </button>
                                <?php endif; ?>
 
                                        </button>
                                <?php endif; ?>
 

-                               <?php if ( $show_categories ) : ?>
-                                       <button type="button" class="button-link post-option">
-                                               <span class="dashicons dashicons-category"></span>
-                                               <span class="post-option-title"><?php _e( 'Categories' ); ?></span>
-                                               <span class="dashicons post-option-forward"></span>
-                                       </button>
-                               <?php endif; ?>
-
-                               <?php if ( $show_tags ) : ?>
-                                       <button type="button" class="button-link post-option">
-                                               <span class="dashicons dashicons-tag"></span>
-                                               <span class="post-option-title"><?php _e( 'Tags' ); ?></span>
-                                               <span class="dashicons post-option-forward"></span>
-                                       </button>
-                               <?php endif; ?>
+                               <button type="button" class="button-link post-option">
+                                       <span class="dashicons dashicons-category"></span>
+                                       <span class="post-option-title"><?php _e( 'Categories' ); ?></span>
+                                       <span class="dashicons post-option-forward"></span>
+                               </button>
+
+                               <button type="button" class="button-link post-option">
+                                       <span class="dashicons dashicons-tag"></span>
+                                       <span class="post-option-title"><?php _e( 'Tags' ); ?></span>
+                                       <span class="dashicons post-option-forward"></span>
+                               </button>

                        </div>
 
                        <?php if ( $supports_formats ) : ?>
                        </div>
 
                        <?php if ( $supports_formats ) : ?>


@@ -1483,27 +1447,23 @@ class WP_Press_This {
                                </div>
                        <?php endif; ?>
 
                                </div>
                        <?php endif; ?>
 

-                       <?php if ( $show_categories ) : ?>
-                               <div class="setting-modal is-off-screen is-hidden">
-                                       <button type="button" class="button-link modal-close">
-                                               <span class="dashicons post-option-back"></span>
-                                               <span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
-                                               <span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
-                                       </button>
-                                       <?php $this->categories_html( $post ); ?>
-                               </div>
-                       <?php endif; ?>
+                       <div class="setting-modal is-off-screen is-hidden">
+                               <button type="button" class="button-link modal-close">
+                                       <span class="dashicons post-option-back"></span>
+                                       <span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
+                                       <span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+                               </button>
+                               <?php $this->categories_html( $post ); ?>
+                       </div>

 
 

-                       <?php if ( $show_tags ) : ?>
-                               <div class="setting-modal tags is-off-screen is-hidden">
-                                       <button type="button" class="button-link modal-close">
-                                               <span class="dashicons post-option-back"></span>
-                                               <span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
-                                               <span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
-                                       </button>
-                                       <?php $this->tags_html( $post ); ?>
-                               </div>
-                       <?php endif; ?>
+                       <div class="setting-modal tags is-off-screen is-hidden">
+                               <button type="button" class="button-link modal-close">
+                                       <span class="dashicons post-option-back"></span>
+                                       <span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
+                                       <span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+                               </button>
+                               <?php $this->tags_html( $post ); ?>
+                       </div>

                </div><!-- .options-panel -->
        </div><!-- .wrapper -->
 
                </div><!-- .options-panel -->
        </div><!-- .wrapper -->
 


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

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