Changeset 3360

Timestamp:

06/14/2016 12:30:54 PM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Better parsing for the short_description. We don't want to allow extra HTML/markdown in the short_description.

See #1724

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-readme-parser.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-readme-parser.php

@@ -210 +210 @@
                 }
 
-                // Sanitize and trim the short_description to match requirements
-                $this->short_description = $this->sanitize_text( $this->short_description );
-                $this->short_description = $this->trim_length( $this->short_description, 150 );
-
                 // Parse out the Upgrade Notice section into it's own data
                 if ( isset( $this->sections['upgrade_notice'] ) ) {
@@ -243 +239 @@
 
                 // Markdownify!
-                $this->short_description = $this->parse_markdown( $this->short_description );
                 $this->sections          = array_map( array( $this, 'parse_markdown' ), $this->sections );
                 $this->upgrade_notice    = array_map( array( $this, 'parse_markdown' ), $this->upgrade_notice );
+
+                // Sanitize and trim the short_description to match requirements
+                $this->short_description = $this->sanitize_text( $this->short_description );
+                $this->short_description = $this->trim_length( $this->short_description, 150 );
+                $this->short_description = $this->parse_markdown( $this->short_description );
+                $this->short_description = wp_strip_all_tags( $this->short_description );
 
                 if ( isset( $this->sections['screenshots'] ) ) {
@@ -280 +281 @@
 
         protected function trim_length( $desc, $length = 150 ) {
-                if ( function_exists( 'mb_strlen' ) && function_exists( 'mb_substr' ) ) {
-                        if ( mb_strlen( $desc ) > $length ) {
-                                $desc = mb_substr( $desc, 0, $length );
-                        }
-                } else {
-                        if ( strlen( $desc ) > $length ) {
-                                $desc = substr( $desc, 0, $length );
+                if ( mb_strlen( $desc ) > $length ) {
+                        $desc = mb_substr( $desc, 0, $length ) . ' …';
+
+                        // If not a full sentence, and one ends within 20% of the end, trim it to that.
+                        if ( '.' !== mb_substr( $desc, -1 ) && ( $pos = mb_strrpos( $desc, '.' ) ) > ( 0.8 * $length ) ) {
+                                $desc = mb_substr( $desc, 0, $pos + 1 );
                         }
                 }