Ticket #19827: core-ticket19827.diff

wp-admin/includes/screen.php

@@ -606 +606 @@
                 if ( ! $args['id'] || ! $args['title'] )
                         return;
 
-                $this->_help_tabs[] = $args;
+                $this->_help_tabs[$args['id']] = $args;
         }
 
         /**
@@ -686 +686 @@
                                 <div id="contextual-help-columns">
                                         <div class="contextual-help-tabs">
                                                 <ul>
-                                                <?php foreach ( $this->_help_tabs as $i => $tab ):
+                                                <?php $i=0; foreach ( $this->_help_tabs as $tab ):
                                                         $link_id  = "tab-link-{$tab['id']}";
                                                         $panel_id = "tab-panel-{$tab['id']}";
                                                         $classes  = ( $i == 0 ) ? 'active' : '';
@@ -697 +697 @@
                                                                         <?php echo esc_html( $tab['title'] ); ?>
                                                                 </a>
                                                         </li>
-                                                <?php endforeach; ?>
+                                                <?php $i++; endforeach; ?>
                                                 </ul>
                                         </div>
 
@@ -708 +708 @@
                                         <?php endif; ?>
 
                                         <div class="contextual-help-tabs-wrap">
-                                                <?php foreach ( $this->_help_tabs as $i => $tab ):
+                                                <?php $i=0; foreach ( $this->_help_tabs as $tab ):
                                                         $panel_id = "tab-panel-{$tab['id']}";
                                                         $classes  = ( $i == 0 ) ? 'active' : '';
                                                         $classes .= ' help-tab-content';
@@ -724 +724 @@
                                                                         call_user_func_array( $tab['callback'], array( $this, $tab ) );
                                                                 ?>
                                                         </div>
-                                                <?php endforeach; ?>
+                                                <?php $i++; endforeach; ?>
                                         </div>
                                 </div>
                         </div>