Changeset 11118

Timestamp:

07/15/2021 10:45:11 PM (5 years ago)

Author:

coffee2code

Message:

Handbooks, ToC: Fix ToC heading ID auto-generation to account for IDs used at different heading levels.

Props oglekler, coffee2code.
See #5064.
Fixes #5705.

File:

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

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

@@ -9 +9 @@
 
         protected $styles = '<style> .toc-jump { text-align: right; font-size: 12px; } .page .toc-heading { margin-top: -50px; padding-top: 50px !important; }</style>';
+
+        /**
+         * Array of HTML ids known to exist on the page or that have been auto-generated.
+         *
+         * @var array
+         */
+        private $used_ids = [];
 
         /**
@@ -104 +111 @@
                 }
 
+                $this->used_ids = $this->get_reserved_ids();
                 for ( $i = 1; $i <= 4; $i++ )
                         $content = $this->add_ids_and_jumpto_links( "h$i", $content );
@@ -154 +162 @@
                 $matches = array();
                 $replacements = array();
-                $used_ids = $this->get_reserved_ids();
 
                 foreach ( $items as $item ) {
@@ -164 +171 @@
                         $count = 2;
                         $orig_id = $id;
-                        while ( in_array( $id, $used_ids ) && $count < 50 ) {
+                        while ( in_array( $id, $this->used_ids ) && $count < 50 ) {
                                 $id = $orig_id . '-' . $count;
                                 $count++;
                         }
-                        $used_ids[] = $id;
+                        $this->used_ids[] = $id;
                 
                         if ( ! $first ) {