Ticket #23450: 23450.14.diff

wp-admin/includes/template.php

@@ -874 +874 @@
  *
  * @since 2.5.0
  *
- * @param string|object $screen Screen identifier
- * @param string $context box context
- * @param mixed $object gets passed to the box callback function as first parameter
+ * @param string|object $screen Screen identifier.
+ * @param string $context box context.
+ * @param mixed $object gets passed to the box callback function as first parameter.
+ * @param bool $accordion (optional) Whether to output meta boxes as accordion sections.
  * @return int number of meta_boxes
  */
-function do_meta_boxes( $screen, $context, $object ) {
+function do_meta_boxes( $screen, $context, $object, $accordion = false ) {
         global $wp_meta_boxes;
         static $already_sorted = false;
 
@@ -892 +893 @@
 
         $hidden = get_hidden_meta_boxes( $screen );
 
-        printf('<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars($context));
+        $section_class = ! $accordion ? 'meta-box-sortables' : 'accordion-container';
 
+        printf('<div id="%1$s-sortables" class="%2$s">', htmlspecialchars( $context ), esc_attr( $section_class ) );
+
+        if ( $accordion )
+                echo '<ul class="outer-border">';
+
         $i = 0;
         do {
-                // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
-                if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
-                        foreach ( $sorted as $box_context => $ids ) {
-                                foreach ( explode(',', $ids ) as $id ) {
-                                        if ( $id && 'dashboard_browser_nag' !== $id )
-                                                add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+                if ( ! $accordion ) {
+                        // Grab the ones the user has manually sorted.
+                        // Pull them out of their previous context/priority and into the one the user chose.
+                        if ( !$already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
+                                foreach ( $sorted as $box_context => $ids ) {
+                                        foreach ( explode(',', $ids ) as $id ) {
+                                                if ( $id && 'dashboard_browser_nag' !== $id )
+                                                        add_meta_box( $id, null, null, $screen, $box_context, 'sorted' );
+                                        }
                                 }
                         }
-                }
-                $already_sorted = true;
+                        $already_sorted = true;
+                }       
 
-                if ( !isset($wp_meta_boxes) || !isset($wp_meta_boxes[$page]) || !isset($wp_meta_boxes[$page][$context]) )
+                if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) )
                         break;
 
-                foreach ( array('high', 'sorted', 'core', 'default', 'low') as $priority ) {
+                foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
                         if ( isset($wp_meta_boxes[$page][$context][$priority]) ) {
                                 foreach ( (array) $wp_meta_boxes[$page][$context][$priority] as $box ) {
                                         if ( false == $box || ! $box['title'] )
                                                 continue;
                                         $i++;
                                         $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : '';
-                                        echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes($box['id'], $page) . $hidden_class . '" ' . '>' . "\n";
-                                        if ( 'dashboard_browser_nag' != $box['id'] )
-                                                echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
-                                        echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
-                                        echo '<div class="inside">' . "\n";
-                                        call_user_func($box['callback'], $object, $box);
-                                        echo "</div>\n";
-                                        echo "</div>\n";
+                                        if ( ! $accordion ) {
+                                                ?>
+                                                <div id="<?php echo esc_attr( $box['id'] ); ?>" class="postbox <?php echo postbox_classes( $box['id'], $page ) . $hidden_class; ?>">
+                                                        <?php 
+                                                        if ( 'dashboard_browser_nag' != $box['id'] )
+                                                                echo '<div class="handlediv" title="' . esc_attr__('Click to toggle') . '"><br /></div>';
+                                                        ?>
+                                                        <h3 class="hndle"><span><?php echo $box['title']; ?></span></h3>
+                                                        <div class="inside">
+                                                                <?php call_user_func( $box['callback'], $object, $box ); ?>
+                                                        </div><!-- .hndle -->
+                                                </div><!-- .postbox -->
+                                        <?php } else { // Accordion output ?>
+                                                <li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
+                                                        <h3 class="accordion-section-title hndle" tabindex="0" title="<?php echo esc_attr( $box['title'] ); ?>"><?php echo esc_html( $box['title'] ); ?></h3>
+                                                        <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
+                                                                <div class="inside">
+                                                                        <?php call_user_func( $box['callback'], $object, $box ); ?>
+                                                                </div><!-- .inside -->
+                                                        </div><!-- .accordion-section-content -->
+                                                </li><!-- .accordion-section -->
+                                                <?php
+                                        }
                                 }
                         }
                 }
         } while(0);
 
-        echo "</div>";
+        if ( ! $accordion ) {
+                echo "</div><!-- .meta-box-sortables -->";
+        } else {
+                echo '</ul><!-- .outer-border -->';
+                echo '</div><!-- .accordion-container -->';
+        }
 
         return $i;
 
@@ -975 +1004 @@
  *
  * @since 3.6.0
  *
- * @uses global $wp_meta_boxes Used to retrieve registered meta boxes.
+ * @uses do_meta_boxes()
  *
  * @param string|object $screen The screen identifier.
  * @param string $context The meta box context.
@@ -983 +1012 @@
  * @return int number of meta boxes as accordion sections.
  */
 function do_accordion_sections( $screen, $context, $object ) {
-        global $wp_meta_boxes;
-
-        if ( empty( $screen ) )
-                $screen = get_current_screen();
-        elseif ( is_string( $screen ) )
-                $screen = convert_to_screen( $screen );
-
-        $page = $screen->id;
-
-        $hidden = get_hidden_meta_boxes( $screen );
-        ?>
-        <div id="side-sortables" class="accordion-container">
-                <ul class="outer-border">
-        <?php
-        $i = 0;
-        do {
-                if ( ! isset( $wp_meta_boxes ) || ! isset( $wp_meta_boxes[$page] ) || ! isset( $wp_meta_boxes[$page][$context] ) )
-                        break;
-
-                foreach ( array( 'high', 'sorted', 'core', 'default', 'low' ) as $priority ) {
-                        if ( isset( $wp_meta_boxes[$page][$context][$priority] ) ) {
-                                foreach ( $wp_meta_boxes[$page][$context][$priority] as $box ) {
-                                        if ( false == $box || ! $box['title'] )
-                                                continue;
-                                        $i++;
-                                        $hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
-                                        ?>
-                                        <li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
-                                                <h3 class="accordion-section-title hndle" tabindex="0" title="<?php echo esc_attr( $box['title'] ); ?>"><?php echo esc_html( $box['title'] ); ?></h3>
-                                                <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
-                                                        <div class="inside">
-                                                                <?php call_user_func( $box['callback'], $object, $box ); ?>
-                                                        </div><!-- .inside -->
-                                                </div><!-- .accordion-section-content -->
-                                        </li><!-- .accordion-section -->
-                                        <?php
-                                }
-                        }
-                }
-        } while(0);
-        ?>
-                </ul><!-- .outer-border -->
-        </div><!-- .accordion-container -->
-        <?php
-        return $i;
+        do_meta_boxes( $screen, 'side', $object, true );
 }
 
 /**