Ticket #1508: private-content.patch

inc/explanations.php

@@ -37 +37 @@
 
                 // Setup.
                 add_action( 'init',                    array( $this, 'register_post_type'     ), 0   );
-                add_action( 'init',                    array( $this, 'remove_editor_support'  ), 100 );
                 add_action( 'edit_form_after_title',   array( $this, 'post_to_expl_controls'  )      );
                 add_action( 'edit_form_top',           array( $this, 'expl_to_post_controls'  )      );
 
@@ -81 +80 @@
         }
 
         /**
-         * Remove 'editor' support for the function, hook, class, and method post types.
-         *
-         * @access public
-         */
-        public function remove_editor_support() {
-                foreach ( $this->post_types as $type ) {
-                        remove_post_type_support( $type, 'editor' );
-                }
-        }
-
-        /**
          * Output the Post-to-Explanation controls in the post editor for functions,
          * hooks, classes, and methods.
          *

inc/formatting.php

@@ -28 +28 @@
                 add_filter( 'the_content', array( __CLASS__, 'remove_inline_internal' ) );
 
                 add_action( 'the_content', array( __CLASS__, 'fix_unintended_markdown' ) );
+
+                add_action( 'init', array( __CLASS__, 'replace_autop' ) );
         }
 
         /**
@@ -224 +226 @@
                 return $text;
         }
 
+        /**
+         * Replaces the normal content autop with a custom version to skip parser types.
+         *
+         * By running this filter replacement late on the wp hook, plugins are given ample
+         * time to remove autop themselves. If they have removed autop, then the maybe_autop
+         * filter is not added. There are potentially conflicting edge cases, but this
+         * should catch at least some of them.
+         *
+         * Other plugins can also remove this functionality fairly easily by removing the wp
+         * hook and stopping this process if needed.
+         */
+        public static function replace_autop() {
+                if ( has_filter( 'the_content', 'wpautop' ) ) {
+                        remove_filter( 'the_content', 'wpautop' );
+                        add_filter( 'the_content', array( __CLASS__, 'maybe_autop' ) );
+                }
+        }
+
+        /**
+         * Autop's all post content except for wp-parser types.
+         *
+         * @param  string $content The content to filter.
+         * @return string          The filtered content, conditionally with autop run.
+         */
+        public static function maybe_autop( $content ) {
+                return ( \DevHub\is_parsed_post_type( get_post_type() ) ) ? $content : wpautop( $content );
+        }
+
 } // DevHub_Formatting
 
 DevHub_Formatting::init();

inc/parsed-content.php

@@ -32 +32 @@
                 // Data.
                 add_action( 'add_meta_boxes',              array( $this, 'add_meta_boxes'        ) );
                 add_action( 'save_post',                   array( $this, 'save_post'             ) );
+                add_filter( 'wp_insert_post_data',         array( $this, 'autop_post_content'    ) );
 
                 // Script and styles.
                 add_action( 'admin_enqueue_scripts',       array( $this, 'admin_enqueue_scripts' ) );
@@ -54 +55 @@
         public function add_meta_boxes() {
                 if ( in_array( $screen = get_current_screen()->id, $this->post_types ) ) {
                         remove_meta_box( 'postexcerpt', $screen, 'normal' );
-                        add_meta_box( 'wporg_parsed_content', __( 'Parsed Content', 'wporg' ), array( $this, 'parsed_meta_box_cb' ), $screen, 'normal' );
+                        add_meta_box( 'wporg_parsed_content', __( 'Parsed Content', 'wporg' ), array( $this, 'parsed_meta_box_cb' ), $screen, 'normal', 'high' );
                 }
         }
 
@@ -87 +88 @@
                                         <label for="excerpt"><?php _e( 'Parsed Summary:', 'wporg' ); ?></label>
                                 </th>
                                 <td>
-                                        <div class="wporg_parsed_readonly <?php echo $ticket ? 'hidden' : ''; ?>"><?php echo apply_filters( 'the_content', $post->post_excerpt ); ?></div>
+                                        <div class="wporg_parsed_readonly <?php echo $ticket ? 'hidden' : ''; ?>"><?php echo apply_filters( 'the_content', wpautop( $post->post_excerpt ) ); ?></div>
                                         <textarea rows="2" cols="40" name="excerpt" class="wporg_parsed_content <?php echo $ticket ? '' : 'hidden'; ?>"><?php echo $post->post_excerpt; ?></textarea>
                                 </td>
                         </tr><!-- .wporg_parsed_content -->
@@ -96 +97 @@
                                         <label for="wporg_parsed_content"><?php _e( 'Parsed Description:', 'wporg' ); ?></label>
                                 </th>
                                 <td>
-                                        <div class="wporg_parsed_readonly <?php echo $ticket ? 'hidden' : ''; ?>"><?php echo apply_filters( 'the_content', $content ); ?></div>
+                                        <div class="wporg_parsed_readonly <?php echo $ticket ? 'hidden' : ''; ?>"><?php echo wp_kses_post( $content ); ?></div>
                                         <div class="wporg_parsed_content <?php echo $ticket ? '' : 'hidden'; ?>">
                                                 <?php wp_editor( $content, 'content', array(
                                                         'media_buttons' => false,
@@ -156 +157 @@
         }
 
         /**
+         * Checks to see if paragraph tags are missing from parsed content and pre-runs autop if not.
+         *
+         * @param  array $data The array of post data to be inserted.
+         * @return array       The updated array of post data, content run through autop if needed.
+         */
+        public function autop_post_content( $data ) {
+                if ( \DevHub\is_parsed_post_type( $data['post_type'] ) && false === strpos( $data['post_content'], '<p>' ) ) {
+                        $data['post_content'] = wpautop( $data['post_content'] );
+                }
+
+                return $data;
+        }
+
+        /**
          * Enqueue JS and CSS on the edit screens for all four post types.
          *
          * @access public

inc/registrations.php

@@ -38 +38 @@
                 $supports = array(
                         'comments',
                         'custom-fields',
-                        'editor',
                         'excerpt',
                         'revisions',
                         'title',

scss/admin.scss

@@ -79 +79 @@
 /* Parsed Content Meta Box */
 .wporg_parsed_content {
         width: 100%;
+}
+
+.form-table .wporg_parsed_readonly {
+        pre > code {
+                display: block;
+        }
+
+        p ~ p {
+                margin-top: 20px;
+        }
 }
+ No newline at end of file

stylesheets/admin.css

@@ -75 +75 @@
 .wporg_parsed_content {
   width: 100%;
 }
+
+.form-table .wporg_parsed_readonly pre > code {
+  display: block;
+}
+.form-table .wporg_parsed_readonly p ~ p {
+  margin-top: 20px;
+}
+
+/*# sourceMappingURL=admin.css.map */