Changes in trunk/src/wp-admin/includes/template.php [33593:34111]

File:

• trunk/src/wp-admin/includes/template.php (modified) (13 diffs)

trunk/src/wp-admin/includes/template.php

@@ -165 +165 @@
  *
  * @since 3.0.0
+ * @since 4.4.0 Introduced the `$echo` argument.
  *
  * @param int          $post_id Optional. Post ID. Default 0.
@@ -180 +181 @@
  *     @type bool   $checked_ontop        Whether to move checked items out of the hierarchy and to
  *                                        the top of the list. Default true.
+ *     @type bool   $echo                 Whether to echo the generated markup. False to return the markup instead
+ *                                        of echoing it. Default true.
  * }
  */
@@ -189 +192 @@
         'walker' => null,
         'taxonomy' => 'category',
-        'checked_ontop' => true
+        'checked_ontop' => true,
+        'echo' => true,
     );
 
@@ -252 +256 @@
     }
 
+    $output = '';
+
     if ( $r['checked_ontop'] ) {
         // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache)
@@ -257 +263 @@
         $keys = array_keys( $categories );
 
-        foreach( $keys as $k ) {
+        foreach ( $keys as $k ) {
             if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
                 $checked_categories[] = $categories[$k];
@@ -265 +271 @@
 
         // Put checked cats on top
-        echo call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
+        $output .= call_user_func_array( array( $walker, 'walk' ), array( $checked_categories, 0, $args ) );
     }
     // Then the rest of them
-    echo call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+    $output .= call_user_func_array( array( $walker, 'walk' ), array( $categories, 0, $args ) );
+
+    if ( $r['echo'] ) {
+        echo $output;
+    }
+
+    return $output;
 }
 
@@ -479 +491 @@
 <form method="get">
 <?php if ( $table_row ) : ?>
-<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
+<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
 <?php else : ?>
 <div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
@@ -487 +499 @@
     <div id="edithead" style="display:none;">
         <div class="inside">
-        <label for="author"><?php _e('Name') ?></label>
-        <input type="text" name="newcomment_author" size="50" value="" id="author" />
+        <label for="author-name"><?php _e( 'Name' ) ?></label>
+        <input type="text" name="newcomment_author" size="50" value="" id="author-name" />
         </div>
 
         <div class="inside">
-        <label for="author-email"><?php _e('E-mail') ?></label>
+        <label for="author-email"><?php _e('Email') ?></label>
         <input type="text" name="newcomment_author_email" size="50" value="" id="author-email" />
         </div>
@@ -743 +755 @@
  *
  * @since 0.71
- *
- * @global WP_Locale $wp_locale
- * @global object    $comment
+ * @since 4.4.0 Converted to use get_comment() instead of the global `$comment`.
+ *
+ * @global WP_Locale  $wp_locale
  *
  * @param int|bool $edit      Accepts 1|true for editing the date, 0|false for adding the date.
@@ -754 +766 @@
  */
 function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) {
-    global $wp_locale, $comment;
+    global $wp_locale;
     $post = get_post();
 
@@ -768 +780 @@
 
     $time_adj = current_time('timestamp');
-    $post_date = ($for_post) ? $post->post_date : $comment->comment_date;
+    $post_date = ($for_post) ? $post->post_date : get_comment()->comment_date;
     $jj = ($edit) ? mysql2date( 'd', $post_date, false ) : gmdate( 'd', $time_adj );
     $mm = ($edit) ? mysql2date( 'm', $post_date, false ) : gmdate( 'm', $time_adj );
@@ -849 +861 @@
  *
  * @since 1.5.0
+ * @since 4.4.0 `$post` argument was added.
  *
  * @global wpdb $wpdb
  *
- * @param int $default Optional. The default page ID to be pre-selected. Default 0.
- * @param int $parent  Optional. The parent page ID. Default 0.
- * @param int $level   Optional. Page depth level. Default 0.
+ * @param int         $default Optional. The default page ID to be pre-selected. Default 0.
+ * @param int         $parent  Optional. The parent page ID. Default 0.
+ * @param int         $level   Optional. Page depth level. Default 0.
+ * @param int|WP_Post $post    Post ID or WP_Post object.
  *
  * @return null|false Boolean False if page has no children, otherwise print out html elements
  */
-function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) {
+function parent_dropdown( $default = 0, $parent = 0, $level = 0, $post = null ) {
     global $wpdb;
-    $post = get_post();
+    $post = get_post( $post );
     $items = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent) );
 
@@ -1084 +1098 @@
                     $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>';
+                    if ( 'dashboard_browser_nag' != $box['id'] ) {
+                        echo '<button class="handlediv button-link" title="' . esc_attr__( 'Click to toggle' ) . '" aria-expanded="true">';
+                        echo '<span class="screen-reader-text">' . sprintf( __( 'Click to toggle %s panel' ), $box['title'] ) . '</span><br />';
+                        echo '</button>';
+                    }
                     echo "<h3 class='hndle'><span>{$box['title']}</span></h3>\n";
                     echo '<div class="inside">' . "\n";