X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..85ad385665744d9cc3bcd939906309be7268edb3:/wp-admin/includes/template.php diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index 38348745..07663826 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -24,17 +24,52 @@ class Walker_Category_Checklist extends Walker { var $tree_type = 'category'; var $db_fields = array ('parent' => 'parent', 'id' => 'term_id'); //TODO: decouple this + /** + * Starts the list before the elements are added. + * + * @see Walker:start_lvl() + * + * @since 2.5.1 + * + * @param string $output Passed by reference. Used to append additional content. + * @param int $depth Depth of category. Used for tab indentation. + * @param array $args An array of arguments. @see wp_terms_checklist() + */ function start_lvl( &$output, $depth = 0, $args = array() ) { $indent = str_repeat("\t", $depth); $output .= "$indent
-
-
+
-
+
+
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) ); if ( $items ) { foreach ( $items as $item ) { // A page cannot be its own parent. - if (!empty ( $post_ID ) ) { - if ( $item->ID == $post_ID ) { - continue; - } - } + if ( $post && $post->ID && $item->ID == $post->ID ) + continue; + $pad = str_repeat( ' ', $level * 3 ); if ( $item->ID == $default) $current = ' selected="selected"'; @@ -695,57 +745,6 @@ function parent_dropdown( $default = 0, $parent = 0, $level = 0 ) { } } -/** - * {@internal Missing Short Description}} - * - * @since 2.0.0 - * - * @param unknown_type $id - * @return unknown - */ -function the_attachment_links( $id = false ) { - $id = (int) $id; - $post = & get_post( $id ); - - if ( $post->post_type != 'attachment' ) - return false; - - $icon = wp_get_attachment_image( $post->ID, 'thumbnail', true ); - $attachment_data = wp_get_attachment_metadata( $id ); - $thumb = isset( $attachment_data['thumb'] ); -?> - - html elements for role selectors * @@ -757,7 +756,7 @@ function wp_dropdown_roles( $selected = false ) { $p = ''; $r = ''; - $editable_roles = get_editable_roles(); + $editable_roles = array_reverse( get_editable_roles() ); foreach ( $editable_roles as $role => $details ) { $name = translate_user_role($details['name'] ); @@ -769,56 +768,6 @@ function wp_dropdown_roles( $selected = false ) { echo $p . $r; } -/** - * {@internal Missing Short Description}} - * - * @since 2.3.0 - * - * @param unknown_type $size - * @return unknown - */ -function wp_convert_hr_to_bytes( $size ) { - $size = strtolower($size); - $bytes = (int) $size; - if ( strpos($size, 'k') !== false ) - $bytes = intval($size) * 1024; - elseif ( strpos($size, 'm') !== false ) - $bytes = intval($size) * 1024 * 1024; - elseif ( strpos($size, 'g') !== false ) - $bytes = intval($size) * 1024 * 1024 * 1024; - return $bytes; -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.3.0 - * - * @param unknown_type $bytes - * @return unknown - */ -function wp_convert_bytes_to_hr( $bytes ) { - $units = array( 0 => 'B', 1 => 'kB', 2 => 'MB', 3 => 'GB' ); - $log = log( $bytes, 1024 ); - $power = (int) $log; - $size = pow(1024, $log - $power); - return $size . $units[$power]; -} - -/** - * {@internal Missing Short Description}} - * - * @since 2.5.0 - * - * @return unknown - */ -function wp_max_upload_size() { - $u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) ); - $p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) ); - $bytes = apply_filters( 'upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes ); - return $bytes; -} - /** * Outputs the form used by the importers to accept the data to be imported * @@ -828,14 +777,14 @@ function wp_max_upload_size() { */ function wp_import_upload_form( $action ) { $bytes = apply_filters( 'import_upload_size_limit', wp_max_upload_size() ); - $size = wp_convert_bytes_to_hr( $bytes ); + $size = size_format( $bytes ); $upload_dir = wp_upload_dir(); if ( ! empty( $upload_dir['error'] ) ) : ?> - +