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

Timestamp:

03/30/2017 05:57:41 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: When the Short description isn't provided, pull it from the main plugin description after markdown has been parsed - this allows the parser to strip out unwanted markup in the description.

Fixes #2643

File:

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

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

@@ -319 +319 @@
         $this->sections = array_filter( $this->sections );
 
-        // Use the first line of the description for the short description if not provided.
-        if ( empty( $this->short_description ) && ! empty( $this->sections['description'] ) ) {
-            $this->short_description = array_filter( explode( "\n", $this->sections['description'] ) )[0];
-        }
-
         // Use the short description for the description section if not provided.
         if ( empty( $this->sections['description'] ) ) {
@@ -352 +347 @@
         $this->upgrade_notice = array_map( array( $this, 'parse_markdown' ), $this->upgrade_notice );
         $this->faq            = array_map( array( $this, 'parse_markdown' ), $this->faq );
+
+        // Use the first line of the description for the short description if not provided.
+        if ( ! $this->short_description && ! empty( $this->sections['description'] ) ) {
+            $this->short_description = array_filter( explode( "\n", $this->sections['description'] ) )[0];
+        }
 
         // Sanitize and trim the short_description to match requirements.
@@ -576 +576 @@
         $heading_style = 'bold'; // 'heading' or 'bold'
         foreach ( $trimmed_lines as $trimmed ) {
-            if ( $trimmed[0] == '#' || $trimmed[0] == '=' ) {
+            if ( $trimmed && ( $trimmed[0] == '#' || $trimmed[0] == '=' ) ) {
                 $heading_style = 'heading';
                 break;