X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/784f914b1e4b1c62d6657e86397c2e83bcee4295..16e7b37c7914d753890c1a05a9335f3b43751eb8:/wp-admin/includes/template.php diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 5138fd20..edf9a864 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -86,7 +86,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) { ); /** - * Filter the taxonomy terms checklist arguments. + * Filters the taxonomy terms checklist arguments. * * @since 3.4.0 * @@ -203,7 +203,7 @@ function wp_popular_terms_checklist( $taxonomy, $default = 0, $number = 10, $ech $popular_ids = array(); foreach ( (array) $terms as $term ) { $popular_ids[] = $term->term_id; - if ( !$echo ) // hack for AJAX use + if ( !$echo ) // Hack for Ajax use. continue; $id = "popular-$taxonomy-$term->term_id"; $checked = in_array( $term->term_id, $checked_terms ) ? 'checked="checked"' : ''; @@ -293,14 +293,15 @@ function get_inline_data($post) {
' . mysql2date( 's', $post->post_date, false ) . '
' . esc_html( $post->post_password ) . '
'; - if ( $post_type_object->hierarchical ) + if ( $post_type_object->hierarchical ) { echo '
' . $post->post_parent . '
'; + } - if ( $post->post_type == 'page' ) - echo '
' . esc_html( get_post_meta( $post->ID, '_wp_page_template', true ) ) . '
'; + echo '
' . ( $post->page_template ? esc_html( $post->page_template ) : 'default' ) . '
'; - if ( post_type_supports( $post->post_type, 'page-attributes' ) ) + if ( post_type_supports( $post->post_type, 'page-attributes' ) ) { echo ''; + } $taxonomy_names = get_object_taxonomies( $post->post_type ); foreach ( $taxonomy_names as $taxonomy_name) { @@ -311,7 +312,7 @@ function get_inline_data($post) { $terms = get_object_term_cache( $post->ID, $taxonomy_name ); if ( false === $terms ) { $terms = wp_get_object_terms( $post->ID, $taxonomy_name ); - wp_cache_add( $post->ID, $terms, $taxonomy_name . '_relationships' ); + wp_cache_add( $post->ID, wp_list_pluck( $terms, 'term_id' ), $taxonomy_name . '_relationships' ); } $term_ids = empty( $terms ) ? array() : wp_list_pluck( $terms, 'term_id' ); @@ -354,7 +355,7 @@ function get_inline_data($post) { function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $table_row = true ) { global $wp_list_table; /** - * Filter the in-line comment reply-to form output in the Comments + * Filters the in-line comment reply-to form output in the Comments * list table. * * Returning a non-empty value here will short-circuit display @@ -423,11 +424,11 @@ function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $

- + - +

@@ -582,7 +583,7 @@ function meta_form( $post = null ) { $post = get_post( $post ); /** - * Filter values for the meta key dropdown in the Custom Fields meta box. + * Filters values for the meta key dropdown in the Custom Fields meta box. * * Returning a non-null value will effectively short-circuit and avoid a * potentially expensive query against postmeta. @@ -596,7 +597,7 @@ function meta_form( $post = null ) { if ( null === $keys ) { /** - * Filter the number of custom fields to retrieve for the drop-down + * Filters the number of custom fields to retrieve for the drop-down * in the Custom Fields meta box. * * @since 2.1.0 @@ -657,7 +658,7 @@ function meta_form( $post = null ) {
- 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?> + 'newmeta-submit', 'data-wp-lists' => 'add:the-list:newmeta' ) ); ?>
@@ -761,11 +762,13 @@ function touch_time( $edit = 1, $for_post = 1, $tab_index = 0, $multi = 0 ) { * Print out option HTML elements for the page templates drop-down. * * @since 1.5.0 + * @since 4.7.0 Added the `$post_type` parameter. * - * @param string $default Optional. The template file name. Default empty. + * @param string $default Optional. The template file name. Default empty. + * @param string $post_type Optional. Post type to get templates for. Default 'post'. */ -function page_template_dropdown( $default = '' ) { - $templates = get_page_templates( get_post() ); +function page_template_dropdown( $default = '', $post_type = 'page' ) { + $templates = get_page_templates( null, $post_type ); ksort( $templates ); foreach ( array_keys( $templates ) as $template ) { $selected = selected( $default, $templates[ $template ], false ); @@ -843,7 +846,7 @@ function wp_dropdown_roles( $selected = '' ) { function wp_import_upload_form( $action ) { /** - * Filter the maximum allowed upload size for import files. + * Filters the maximum allowed upload size for import files. * * @since 2.3.0 * @@ -1027,8 +1030,16 @@ function do_meta_boxes( $screen, $context, $object ) { $hidden_class = in_array($box['id'], $hidden) ? ' hide-if-js' : ''; echo '
' . "\n"; if ( 'dashboard_browser_nag' != $box['id'] ) { + $widget_title = $box[ 'title' ]; + + if ( is_array( $box[ 'args' ] ) && isset( $box[ 'args' ][ '__widget_basename' ] ) ) { + $widget_title = $box[ 'args' ][ '__widget_basename' ]; + // Do not pass this parameter to the user callback function. + unset( $box[ 'args' ][ '__widget_basename' ] ); + } + echo ''; } @@ -1060,12 +1071,11 @@ function do_meta_boxes( $screen, $context, $object ) { * @param string|array|WP_Screen $screen The screen or screens on which the meta box is shown (such as a * post type, 'link', or 'comment'). Accepts a single screen ID, * WP_Screen object, or array of screen IDs. - * @param string $context Optional. The context within the screen where the boxes - * should display. Available contexts vary from screen to - * screen. Post edit screen contexts include 'normal', 'side', - * and 'advanced'. Comments screen contexts include 'normal' - * and 'side'. Menus meta boxes (accordion sections) all use - * the 'side' context. Global default is 'advanced'. + * @param string $context The context within the screen where the box is set to display. + * Contexts vary from screen to screen. Post edit screen contexts + * include 'normal', 'side', and 'advanced'. Comments screen contexts + * include 'normal' and 'side'. Menus meta boxes (accordion sections) + * all use the 'side' context. */ function remove_meta_box( $id, $screen, $context ) { global $wp_meta_boxes; @@ -1100,7 +1110,7 @@ function remove_meta_box( $id, $screen, $context ) { /** * Meta Box Accordion Template Function * - * Largely made up of abstracted code from {@link do_meta_boxes()}, this + * Largely made up of abstracted code from do_meta_boxes(), this * function serves to build meta boxes as list items for display as * a collapsible accordion. * @@ -1197,12 +1207,12 @@ function add_settings_section($id, $title, $callback, $page) { global $wp_settings_sections; if ( 'misc' == $page ) { - _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) ); + _deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) ); $page = 'general'; } if ( 'privacy' == $page ) { - _deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) ); + _deprecated_argument( __FUNCTION__, '3.5.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) ); $page = 'reading'; } @@ -1248,12 +1258,12 @@ function add_settings_field($id, $title, $callback, $page, $section = 'default', global $wp_settings_fields; if ( 'misc' == $page ) { - _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) ); + _deprecated_argument( __FUNCTION__, '3.0.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) ); $page = 'general'; } if ( 'privacy' == $page ) { - _deprecated_argument( __FUNCTION__, '3.5', __( 'The privacy options group has been removed. Use another settings group.' ) ); + _deprecated_argument( __FUNCTION__, '3.5.0', __( 'The privacy options group has been removed. Use another settings group.' ) ); $page = 'reading'; } @@ -1383,7 +1393,8 @@ function add_settings_error( $setting, $code, $message, $type = 'error' ) { * * Use the $sanitize argument to manually re-sanitize the option before returning errors. * This is useful if you have errors or notices you want to show even when the user - * hasn't submitted data (i.e. when they first load an options page, or in admin_notices action hook) + * hasn't submitted data (i.e. when they first load an options page, or in the {@see 'admin_notices'} + * action hook). * * @since 3.0.0 * @@ -1428,16 +1439,16 @@ function get_settings_errors( $setting = '', $sanitize = false ) { } /** - * Display settings errors registered by {@see add_settings_error()}. + * Display settings errors registered by add_settings_error(). * * Part of the Settings API. Outputs a div for each error retrieved by - * {@see get_settings_errors()}. + * get_settings_errors(). * * This is called automatically after a settings page based on the * Settings API is submitted. Errors should be added during the validation - * callback function for a setting defined in {@see register_setting()} + * callback function for a setting defined in register_setting(). * - * The $sanitize option is passed into {@see get_settings_errors()} and will + * The $sanitize option is passed into get_settings_errors() and will * re-run the setting sanitization * on its current value. * @@ -1451,7 +1462,8 @@ function get_settings_errors( $setting = '', $sanitize = false ) { * * @param string $setting Optional slug title of a specific setting who's errors you want. * @param bool $sanitize Whether to re-sanitize the setting value before returning errors. - * @param bool $hide_on_update If set to true errors will not be shown if the settings page has already been submitted. + * @param bool $hide_on_update If set to true errors will not be shown if the settings page has + * already been submitted. */ function settings_errors( $setting = '', $sanitize = false, $hide_on_update = false ) { @@ -1486,7 +1498,7 @@ function find_posts_div($found_action = '') {