X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/9c40b4d36daed9e28e48a5fe9205c32557195a4b..ae01624bdce6b71c47e08e8a0287de58284a6b73:/wp-includes/post-template.php diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 30856c58..bf4671b6 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -12,24 +12,22 @@ * Display the ID of the current item in the WordPress Loop. * * @since 0.71 - * @uses $id */ function the_ID() { - global $id; - echo $id; + echo get_the_ID(); } /** * Retrieve the ID of the current item in the WordPress Loop. * * @since 2.1.0 - * @uses $id + * @uses $post * - * @return unknown + * @return int */ function get_the_ID() { - global $id; - return $id; + global $post; + return $post->ID; } /** @@ -106,7 +104,8 @@ function the_title_attribute( $args = '' ) { function get_the_title( $id = 0 ) { $post = &get_post($id); - $title = $post->post_title; + $title = isset($post->post_title) ? $post->post_title : ''; + $id = isset($post->ID) ? $post->ID : (int) $id; if ( !is_admin() ) { if ( !empty($post->post_password) ) { @@ -117,7 +116,7 @@ function get_the_title( $id = 0 ) { $title = sprintf($private_title_format, $title); } } - return apply_filters( 'the_title', $title, $post->ID ); + return apply_filters( 'the_title', $title, $id ); } /** @@ -127,12 +126,14 @@ function get_the_title( $id = 0 ) { * post. The reason you should not use it as a link, is because of moving the * blog across domains. * + * Url is escaped to make it xml safe + * * @since 1.5.0 * * @param int $id Optional. Post ID. */ function the_guid( $id = 0 ) { - echo get_the_guid($id); + echo esc_url( get_the_guid( $id ) ); } /** @@ -160,10 +161,9 @@ function get_the_guid( $id = 0 ) { * * @param string $more_link_text Optional. Content for when there is more text. * @param string $stripteaser Optional. Teaser content before the more text. - * @param string $more_file Optional. Not used. */ -function the_content($more_link_text = null, $stripteaser = 0, $more_file = '') { - $content = get_the_content($more_link_text, $stripteaser, $more_file); +function the_content($more_link_text = null, $stripteaser = 0) { + $content = get_the_content($more_link_text, $stripteaser); $content = apply_filters('the_content', $content); $content = str_replace(']]>', ']]>', $content); echo $content; @@ -176,11 +176,10 @@ function the_content($more_link_text = null, $stripteaser = 0, $more_file = '') * * @param string $more_link_text Optional. Content for when there is more text. * @param string $stripteaser Optional. Teaser content before the more text. - * @param string $more_file Optional. Not used. * @return string */ -function get_the_content($more_link_text = null, $stripteaser = 0, $more_file = '') { - global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow; +function get_the_content($more_link_text = null, $stripteaser = 0) { + global $post, $more, $page, $pages, $multipage, $preview; if ( null === $more_link_text ) $more_link_text = __( '(more...)' ); @@ -194,11 +193,6 @@ function get_the_content($more_link_text = null, $stripteaser = 0, $more_file = return $output; } - if ( $more_file != '' ) - $file = $more_file; - else - $file = $pagenow; //$_SERVER['PHP_SELF']; - if ( $page > count($pages) ) // if the requested page doesn't exist $page = count($pages); // give them the highest numbered page that DOES exist @@ -220,20 +214,32 @@ function get_the_content($more_link_text = null, $stripteaser = 0, $more_file = $output .= $teaser; if ( count($content) > 1 ) { if ( $more ) { - $output .= '' . $content[1]; + $output .= '' . $content[1]; } else { if ( ! empty($more_link_text) ) - $output .= apply_filters( 'the_content_more_link', ' $more_link_text", $more_link_text ); + $output .= apply_filters( 'the_content_more_link', ' ID}\" class=\"more-link\">$more_link_text", $more_link_text ); $output = force_balance_tags($output); } } if ( $preview ) // preview fix for javascript bug with foreign languages - $output = preg_replace_callback('/\%u([0-9A-F]{4})/', create_function('$match', 'return "" . base_convert($match[1], 16, 10) . ";";'), $output); + $output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output); return $output; } +/** + * Preview fix for javascript bug with foreign languages + * + * @since 3.1.0 + * @access private + * @param array $match Match array from preg_replace_callback + * @returns string + */ +function _convert_urlencoded_to_entities( $match ) { + return '' . base_convert( $match[1], 16, 10 ) . ';'; +} + /** * Display the post excerpt. * @@ -252,9 +258,11 @@ function the_excerpt() { * @param mixed $deprecated Not used. * @return string */ -function get_the_excerpt($deprecated = '') { +function get_the_excerpt( $deprecated = '' ) { + if ( !empty( $deprecated ) ) + _deprecated_argument( __FUNCTION__, '2.3' ); + global $post; - $output = ''; $output = $post->post_excerpt; if ( post_password_required($post) ) { $output = __('There is no excerpt because this is a protected post.'); @@ -312,28 +320,51 @@ function get_post_class( $class = '', $post_id = null ) { $classes = array(); + if ( empty($post) ) + return $classes; + $classes[] = 'post-' . $post->ID; $classes[] = $post->post_type; + $classes[] = 'type-' . $post->post_type; + $classes[] = 'status-' . $post->post_status; + + // Post Format + $post_format = get_post_format( $post->ID ); + + if ( post_type_supports( $post->post_type, 'post-formats' ) ) { + if ( $post_format && !is_wp_error($post_format) ) + $classes[] = 'format-' . sanitize_html_class( $post_format ); + else + $classes[] = 'format-standard'; + } + + // post requires password + if ( post_password_required($post->ID) ) + $classes[] = 'post-password-required'; // sticky for Sticky Posts - if ( is_sticky($post->ID) && is_home()) + if ( is_sticky($post->ID) && is_home() && !is_paged() ) $classes[] = 'sticky'; - // hentry for hAtom compliace + // hentry for hAtom compliance $classes[] = 'hentry'; // Categories - foreach ( (array) get_the_category($post->ID) as $cat ) { - if ( empty($cat->slug ) ) - continue; - $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID); + if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) { + foreach ( (array) get_the_category($post->ID) as $cat ) { + if ( empty($cat->slug ) ) + continue; + $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id); + } } // Tags - foreach ( (array) get_the_tags($post->ID) as $tag ) { - if ( empty($tag->slug ) ) - continue; - $classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->term_id); + if ( is_object_in_taxonomy( $post->post_type, 'post_tag' ) ) { + foreach ( (array) get_the_tags($post->ID) as $tag ) { + if ( empty($tag->slug ) ) + continue; + $classes[] = 'tag-' . sanitize_html_class($tag->slug, $tag->term_id); + } } if ( !empty($class) ) { @@ -342,7 +373,9 @@ function get_post_class( $class = '', $post_id = null ) { $classes = array_merge($classes, $class); } - return apply_filters('post_class', $classes, $class, $post_id); + $classes = array_map('esc_attr', $classes); + + return apply_filters('post_class', $classes, $class, $post->ID); } /** @@ -366,11 +399,11 @@ function body_class( $class = '' ) { * @return array Array of classes. */ function get_body_class( $class = '' ) { - global $wp_query, $wpdb, $current_user; + global $wp_query, $wpdb; $classes = array(); - if ( 'rtl' == get_bloginfo('text_direction') ) + if ( is_rtl() ) $classes[] = 'rtl'; if ( is_front_page() ) @@ -391,54 +424,74 @@ function get_body_class( $class = '' ) { $classes[] = 'error404'; if ( is_single() ) { - $wp_query->post = $wp_query->posts[0]; - setup_postdata($wp_query->post); + $post_id = $wp_query->get_queried_object_id(); + $post = $wp_query->get_queried_object(); - $postID = $wp_query->post->ID; - $classes[] = 'single postid-' . $postID; + $classes[] = 'single'; + $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id); + $classes[] = 'postid-' . $post_id; + + // Post Format + $post_format = get_post_format( $post->ID ); + + if ( $post_format && !is_wp_error($post_format) ) + $classes[] = 'single-format-' . sanitize_html_class( $post_format ); + else + $classes[] = 'single-format-standard'; if ( is_attachment() ) { - $mime_type = get_post_mime_type(); + $mime_type = get_post_mime_type($post_id); $mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' ); - $classes[] = 'attachmentid-' . $postID; - $classes[] = 'attachment-' . str_replace($mime_prefix, '', $mime_type); + $classes[] = 'attachmentid-' . $post_id; + $classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type ); } } elseif ( is_archive() ) { - if ( is_author() ) { + if ( is_post_type_archive() ) { + $classes[] = 'post-type-archive'; + $classes[] = 'post-type-archive-' . sanitize_html_class( get_query_var( 'post_type' ) ); + } else if ( is_author() ) { $author = $wp_query->get_queried_object(); $classes[] = 'author'; - $classes[] = 'author-' . sanitize_html_class($author->user_nicename , $author->user_id); + $classes[] = 'author-' . sanitize_html_class( $author->user_nicename , $author->ID ); + $classes[] = 'author-' . $author->ID; } elseif ( is_category() ) { $cat = $wp_query->get_queried_object(); $classes[] = 'category'; - $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->cat_ID); + $classes[] = 'category-' . sanitize_html_class( $cat->slug, $cat->term_id ); + $classes[] = 'category-' . $cat->term_id; } elseif ( is_tag() ) { $tags = $wp_query->get_queried_object(); $classes[] = 'tag'; - $classes[] = 'tag-' . sanitize_html_class($tags->slug, $tags->term_id); + $classes[] = 'tag-' . sanitize_html_class( $tags->slug, $tags->term_id ); + $classes[] = 'tag-' . $tags->term_id; + } elseif ( is_tax() ) { + $term = $wp_query->get_queried_object(); + $classes[] = 'tax-' . sanitize_html_class( $term->taxonomy ); + $classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id ); + $classes[] = 'term-' . $term->term_id; } } elseif ( is_page() ) { $classes[] = 'page'; - $wp_query->post = $wp_query->posts[0]; - setup_postdata($wp_query->post); + $page_id = $wp_query->get_queried_object_id(); - $pageID = $wp_query->post->ID; + $post = get_page($page_id); - $classes[] = 'page-id-' . $pageID; + $classes[] = 'page-id-' . $page_id; - if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' LIMIT 1", $pageID) ) ) + if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status = 'publish' LIMIT 1", $page_id) ) ) $classes[] = 'page-parent'; - if ( $wp_query->post->post_parent ) + if ( $post->post_parent ) { $classes[] = 'page-child'; - $classes[] = 'parent-pageid-' . $wp_query->post->post_parent; - - if ( is_page_template() ) + $classes[] = 'parent-pageid-' . $post->post_parent; + } + if ( is_page_template() ) { $classes[] = 'page-template'; - $classes[] = 'page-template-' . str_replace( '.php', '-php', get_post_meta( $pageID, '_wp_page_template', true ) ); + $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_wp_page_template', true ) ), '' ); + } } elseif ( is_search() ) { - if ( !empty($wp_query->posts) ) + if ( !empty( $wp_query->posts ) ) $classes[] = 'search-results'; else $classes[] = 'search-no-results'; @@ -447,10 +500,13 @@ function get_body_class( $class = '' ) { if ( is_user_logged_in() ) $classes[] = 'logged-in'; - $page = $wp_query->get('page'); + if ( is_admin_bar_showing() ) + $classes[] = 'admin-bar'; + + $page = $wp_query->get( 'page' ); if ( !$page || $page < 2) - $page = $wp_query->get('paged'); + $page = $wp_query->get( 'paged' ); if ( $page && $page > 1 ) { $classes[] = 'paged-' . $page; @@ -469,15 +525,19 @@ function get_body_class( $class = '' ) { $classes[] = 'author-paged-' . $page; elseif ( is_search() ) $classes[] = 'search-paged-' . $page; + elseif ( is_post_type_archive() ) + $classes[] = 'post-type-paged-' . $page; } - if ( !empty($class) ) { + if ( !empty( $class ) ) { if ( !is_array( $class ) ) - $class = preg_split('#\s+#', $class); - $classes = array_merge($classes, $class); + $class = preg_split( '#\s+#', $class ); + $classes = array_merge( $classes, $class ); } - return apply_filters('body_class', $classes, $class); + $classes = array_map( 'esc_attr', $classes ); + + return apply_filters( 'body_class', $classes, $class ); } /** @@ -544,12 +604,12 @@ function sticky_class( $post_id = null ) { * each bookmarks. * 'after' - Default is '
' (string). The html or text to append to each * bookmarks. - * 'more_file' - Default is '' (string) Page the links should point to. Defaults - * to the current page. * 'link_before' - Default is '' (string). The html or text to prepend to each - * Pages link inside the tag. + * Pages link inside the tag. Also prepended to the current item, which + * is not linked. * 'link_after' - Default is '' (string). The html or text to append to each - * Pages link inside the tag. + * Pages link inside the tag. Also appended to the current item, which + * is not linked. * * @since 1.2.0 * @access private @@ -563,39 +623,26 @@ function wp_link_pages($args = '') { 'link_before' => '', 'link_after' => '', 'next_or_number' => 'number', 'nextpagelink' => __('Next page'), 'previouspagelink' => __('Previous page'), 'pagelink' => '%', - 'more_file' => '', 'echo' => 1 + 'echo' => 1 ); $r = wp_parse_args( $args, $defaults ); + $r = apply_filters( 'wp_link_pages_args', $r ); extract( $r, EXTR_SKIP ); - global $post, $page, $numpages, $multipage, $more, $pagenow; - if ( $more_file != '' ) - $file = $more_file; - else - $file = $pagenow; + global $page, $numpages, $multipage, $more, $pagenow; $output = ''; if ( $multipage ) { if ( 'number' == $next_or_number ) { $output .= $before; for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) { - $j = str_replace('%',"$i",$pagelink); + $j = str_replace('%',$i,$pagelink); $output .= ' '; if ( ($i != $page) || ((!$more) && ($page==1)) ) { - if ( 1 == $i ) { - $output .= ''; - } else { - if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) - $output .= ''; - else - $output .= ''; - } - + $output .= _wp_link_page($i); } - $output .= $link_before; - $output .= $j; - $output .= $link_after; + $output .= $link_before . $j . $link_after; if ( ($i != $page) || ((!$more) && ($page==1)) ) $output .= ''; } @@ -605,25 +652,13 @@ function wp_link_pages($args = '') { $output .= $before; $i = $page - 1; if ( $i && $more ) { - if ( 1 == $i ) { - $output .= '' . $link_before. $previouspagelink . $link_after . ''; - } else { - if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) - $output .= '' . $link_before. $previouspagelink . $link_after . ''; - else - $output .= '' . $link_before. $previouspagelink . $link_after . ''; - } + $output .= _wp_link_page($i); + $output .= $link_before. $previouspagelink . $link_after . ''; } $i = $page + 1; if ( $i <= $numpages && $more ) { - if ( 1 == $i ) { - $output .= '' . $link_before. $nextpagelink . $link_after . ''; - } else { - if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) - $output .= '' . $link_before. $nextpagelink . $link_after . ''; - else - $output .= '' . $link_before. $nextpagelink . $link_after . ''; - } + $output .= _wp_link_page($i); + $output .= $link_before. $nextpagelink . $link_after . ''; } $output .= $after; } @@ -636,6 +671,31 @@ function wp_link_pages($args = '') { return $output; } +/** + * Helper function for wp_link_pages(). + * + * @since 3.1.0 + * @access private + * + * @param int $i Page number. + * @return string Link. + */ +function _wp_link_page( $i ) { + global $post, $wp_rewrite; + + if ( 1 == $i ) { + $url = get_permalink(); + } else { + if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) + $url = add_query_arg( 'page', $i, get_permalink() ); + elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) + $url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged'); + else + $url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged'); + } + + return ''; +} // // Post-meta: Custom per-post fields. @@ -647,12 +707,14 @@ function wp_link_pages($args = '') { * @since 1.5.0 * * @param string $key Meta data key name. - * @return string|array Array of values or single value, if only one element exists. + * @return bool|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist. */ function post_custom( $key = '' ) { $custom = get_post_custom(); - if ( 1 == count($custom[$key]) ) + if ( !isset( $custom[$key] ) ) + return false; + elseif ( 1 == count($custom[$key]) ) return $custom[$key][0]; else return $custom[$key]; @@ -670,7 +732,7 @@ function the_meta() { echo " '; } - $output = apply_filters('wp_list_pages', $output); + $output = apply_filters('wp_list_pages', $output, $r); if ( $r['echo'] ) echo $output; @@ -805,7 +873,7 @@ function wp_list_pages($args = '') { * @param array|string $args */ function wp_page_menu( $args = array() ) { - $defaults = array('sort_column' => 'post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => ''); + $defaults = array('sort_column' => 'menu_order, post_title', 'menu_class' => 'menu', 'echo' => true, 'link_before' => '', 'link_after' => ''); $args = wp_parse_args( $args, $defaults ); $args = apply_filters( 'wp_page_menu_args', $args ); @@ -814,7 +882,7 @@ function wp_page_menu( $args = array() ) { $list_args = $args; // Show Home in the menu - if ( isset($args['show_home']) && ! empty($args['show_home']) ) { + if ( ! empty($args['show_home']) ) { if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) $text = __('Home'); else @@ -822,7 +890,7 @@ function wp_page_menu( $args = array() ) { $class = ''; if ( is_front_page() && !is_paged() ) $class = 'class="current_page_item"'; - $menu .= '> element before content. * @@ -1147,8 +1220,8 @@ function get_the_password_form() { /** * Whether currently in a page template. * - * This template tag allows you to determine whether or not you are in a page - * template. You can optional provide a template name and then the check will be + * This template tag allows you to determine if you are in a page template. + * You can optionally provide a template name and then the check will be * specific to that template. * * @since 2.5.0 @@ -1207,7 +1280,7 @@ function wp_post_revision_title( $revision, $link = true ) { /* translators: 1: date */ $currentf = __( '%1$s [Current Revision]' ); - $date = date_i18n( $datef, strtotime( $revision->post_modified_gmt . ' +0000' ) ); + $date = date_i18n( $datef, strtotime( $revision->post_modified ) ); if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) $date = "$date"; @@ -1257,17 +1330,17 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { extract( wp_parse_args( $args, $defaults ), EXTR_SKIP ); switch ( $type ) { - case 'autosave' : - if ( !$autosave = wp_get_post_autosave( $post->ID ) ) - return; - $revisions = array( $autosave ); - break; - case 'revision' : // just revisions - remove autosave later - case 'all' : - default : - if ( !$revisions = wp_get_post_revisions( $post->ID ) ) - return; - break; + case 'autosave' : + if ( !$autosave = wp_get_post_autosave( $post->ID ) ) + return; + $revisions = array( $autosave ); + break; + case 'revision' : // just revisions - remove autosave later + case 'all' : + default : + if ( !$revisions = wp_get_post_revisions( $post->ID ) ) + return; + break; } /* translators: post revision: 1: when, 2: author name */ @@ -1298,12 +1371,13 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { $class = $class ? '' : " class='alternate'"; if ( $post->ID != $revision->ID && $can_edit_post ) - $actions = 'ID|$revision->ID" ) . '">' . __( 'Restore' ) . ''; + $actions = 'ID|$revision->ID" ) . '">' . __( 'Restore' ) . ''; else $actions = ''; $rows .= "
- | + | + | + |
---|