Changes in sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown [10140:10833]

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php (modified) (10 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-markdown/inc/class-importer.php

@@ -86 +86 @@
                 // Account for potential handbook landing page, which results in an empty $key.
                 if ( ! $key ) {
-                        if ( in_array( $post->post_name, [ 'handbook', $post->post_type, "{$post->post_type}-handbook" ] ) ) {
+                        if ( in_array( $post->post_name, [ 'handbook', $post->post_type, "{$post->post_type}-handbook", 'welcome' ] ) ) {
                                 $key = $post->post_name;
                         }
@@ -117 +117 @@
                         }
                         return new WP_Error( 'invalid-http-code', 'Markdown source returned non-200 http code.' );
+                } else {
+                        if ( class_exists( 'WP_CLI' ) ) {
+                                WP_CLI::log( "Importing manifest from " . $this->get_manifest_url() );
+                        }       
                 }
                 $manifest = json_decode( wp_remote_retrieve_body( $response ), true );
@@ -128 +132 @@
 
                 // A numeric key suggests the manifest did not explicitly specify keys for each item, so define one.
+                // Note: not explicitly specifying a key means the slugs defined must be unique.
                 $keys = array_keys( $manifest );
                 if ( is_int( array_shift( $keys ) ) ) {
@@ -162 +167 @@
                 foreach ( $manifest as $key => $doc ) {
                         // Already exists, update.
-                        $existing = $this->existing[ $key ] ?? $this->existing['slug_only'][ $key ] ?? false;
+                        $existing = $this->existing[ $key ]
+                                ?? $this->existing['slug_only'][ $key ]
+                                ?? $this->existing[ $doc['slug'] ]
+                                ?? $this->existing['slug_only'][ $doc['slug'] ]
+                                ?? false;
                         if ( ! $existing && 'index' === $key ) {
                                 $key = $this->get_post_type();
@@ -180 +189 @@
                 }
                 if ( class_exists( 'WP_CLI' ) ) {
-                        WP_CLI::success( "Successfully created {$created} and updated {$updated} handbook pages." );
+                        if ( 0 === $created && 0 === $updated ) {
+                                WP_CLI::success( "No updates detected for any handbook page." );
+                        } else {
+                                WP_CLI::success( "Successfully created {$created} and updated {$updated} handbook pages." );
+                        }
                 }
         }
@@ -237 +250 @@
                         $post_data['post_title'] = sanitize_text_field( wp_slash( $doc['title'] ) );
                 }
+
+                /**
+                 * Filters the post data used to create a post from the manifest.
+                 *
+                 * @param array $post_data Post data.
+                 */
+                $post_data = apply_filters( 'wporg_markdown_post_data_pre_insert', $post_data );
+
                 $post_id = wp_insert_post( $post_data );
                 if ( ! $post_id ) {
@@ -411 +432 @@
                         'headers' => array(),
                 );
-                $last_etag = get_post_meta( $post_id, $this->etag_meta_key, true );
+                /**
+                 * Filters if HTTP ETags should be included in request for remote Markdown
+                 * source update.
+                 *
+                 * @param bool $check_etags Should HTTP ETags be checcked? Default true.
+                 */
+                $last_etag = apply_filters( 'wporg_markdown_check_etags', true ) ? get_post_meta( $post_id, $this->etag_meta_key, true ) : false;
                 if ( ! empty( $last_etag ) ) {
                         $args['headers']['If-None-Match'] = $last_etag;
@@ -459 +486 @@
                 $html = apply_filters( 'wporg_markdown_after_transform', $html, $this->get_post_type() );
 
+                add_filter( 'wp_kses_allowed_html', [ $this, 'wp_kses_allow_links' ], 10, 2 );
+
                 $post_data = array(
                         'ID'           => $post_id,
@@ -465 +494 @@
                 );
 
+                remove_filter( 'wp_kses_allowed_html', [ $this, 'wp_kses_allow_links' ], 10 );
+
                 $fields_from_manifest = $this->update_post_from_manifest( $post_id, $title, false );
                 if ( $fields_from_manifest ) {
@@ -476 +507 @@
 
                 return true;
+        }
+
+        /**
+         * Ensures that the 'a' tag and certain of its attributes are allowed in
+         * posts if not already.
+         *
+         * Supported 'a' attributes are those defined for `$allowedposttags` by default.
+         *
+         * This is necessary since the 'a' tag is being removed somewhere along the way.
+         *
+         * @param array[]|string $allowed_tags Allowed HTML tags and their attributes
+         *                                     or the context to judge allowed tags by.
+         * @param string         $context      Context name.
+         * @return array[]|string
+         */
+        public function wp_kses_allow_links( $allowed_tags, $context ) {
+                if ( 'post' === $context && is_array( $allowed_tags ) && empty( $allowed_tags[ 'a' ] ) ) {
+                        $allowed_tags['a'] = [
+                                'href'     => true,
+                                'rel'      => true,
+                                'rev'      => true,
+                                'name'     => true,
+                                'target'   => true,
+                                'download' => [
+                                                'valueless' => 'y',
+                                ],
+                        ];
+                }
+
+                return $allowed_tags;
         }