Changeset 11354 for sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php

Timestamp:

12/06/2021 03:21:28 AM (3 years ago)

Author:

dd32

Message:

Handbooks, ToC: Be less greedy when matching headings within the content.

[11341] didn't change the greedyness, but as it was now matching headings with attributes, it was matching too much on reference pages.

Additionally, we now don't use style-only headings (those without text) as valid sections.

See #5963.
Fixes #5973.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/handbook/inc/table-of-contents.php

@@ -110 +110 @@
         }
 
+        // Remove any links we don't need.
+        foreach ( $items as $i => $item ) {
+            // If an element is all HTML, don't link to it.
+            if ( empty( trim( strip_tags( $item['title'] ) ) ) ) {
+                unset( $items[ $i ] );
+            }
+        }
+
         // Generate a list of the IDs in the document (generating them as needed).
         $this->used_ids = $this->get_reserved_ids();
@@ -236 +244 @@
         }
 
-        preg_match_all( "/(?P<tag><{$tag}(?P<attrs>[^>]*)>)(?P<title>.*)(<\/{$tag}>)/iJ", $content, $matches, PREG_SET_ORDER );
+        preg_match_all( "/(?P<tag><{$tag}(?P<attrs>[^>]*)>)(?P<title>.*?)(<\/{$tag}>)/iJ", $content, $matches, PREG_SET_ORDER );
 
         return $matches;