Changeset 4562

Timestamp:

12/21/2016 01:13:58 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: When parsing the FAQ and Update Notice sections, match sub-sections based on EITHER headings or full-line bolding, not both. This changes it to only match the first style it encounters, to avoid scenario's where a full-line bolding exists within an otherwise properly formatted heading block.

Fixes #2336

File:

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

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

@@ -551 +551 @@
                 }
 
+                /*
+                 * The heading style being matched in the block. Can be 'heading' or 'bold'.
+                 * Standard Markdown headings (## .. and == ... ==) are matched if they exist.
+                 * Full line bolding is otherwise used as the heading style.
+                 * This will match sections based on which ever style is encountered in a block of text first.
+                 */
+                $heading_style = false; // 'heading' or 'bold'
+
                 while ( ( $line = array_shift( $lines ) ) !== null ) {
                         $trimmed = trim( $line );
@@ -558 +566 @@
                         }
 
-                        // Normal headings (##.. == ... ==) are matched if they exist, Bold is only used if it starts and ends the line.
-                        if ( $trimmed[0] == '#' || $trimmed[0] == '=' || ( substr( $trimmed, 0, 2 ) == '**' && substr( $trimmed, -2 ) == '**' ) ) {
+                        $is_heading = false;
+                        if (
+                                ( ! $heading_style || 'heading' == $heading_style ) &&
+                                ( $trimmed[0] == '#' || $trimmed[0] == '=' )
+                                ) {
+                                $heading_style = 'heading';
+                                $is_heading = true;
+                        } elseif (
+                                ( ! $heading_style || 'bold' == $heading_style ) &&
+                                ( substr( $trimmed, 0, 2 ) == '**' && substr( $trimmed, -2 ) == '**' )
+                                ) {
+                                $heading_style = 'bold';
+                                $is_heading = true;
+                        }
+
+                        if ( $is_heading ) {
                                 if ( $value ) {
                                         $return[ $key ] = trim( $value );