X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8f374b7233bc2815ccc387e448d208c5434eb961..a349837896628462bf8c9bdc27d1477a10fe03eb:/wp-includes/post-template.php diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 5a414eaf..37290d5b 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -26,8 +26,7 @@ function the_ID() { * @return int */ function get_the_ID() { - global $post; - return $post->ID; + return get_post()->ID; } /** @@ -70,15 +69,15 @@ function the_title($before = '', $after = '', $echo = true) { * @return string|null Null on failure or display. String when echo is false. */ function the_title_attribute( $args = '' ) { - $title = get_the_title(); + $defaults = array('before' => '', 'after' => '', 'echo' => true, 'post' => get_post() ); + $r = wp_parse_args($args, $defaults); + extract( $r, EXTR_SKIP ); + + $title = get_the_title( $post ); if ( strlen($title) == 0 ) return; - $defaults = array('before' => '', 'after' => '', 'echo' => true); - $r = wp_parse_args($args, $defaults); - extract( $r, EXTR_SKIP ); - $title = $before . $title . $after; $title = esc_attr(strip_tags($title)); @@ -97,24 +96,25 @@ function the_title_attribute( $args = '' ) { * * @since 0.71 * - * @param int $id Optional. Post ID. + * @param int|object $post Optional. Post ID or object. * @return string */ -function get_the_title( $id = 0 ) { - $post = &get_post($id); - - $title = isset($post->post_title) ? $post->post_title : ''; - $id = isset($post->ID) ? $post->ID : (int) $id; - - if ( !is_admin() ) { - if ( !empty($post->post_password) ) { - $protected_title_format = apply_filters('protected_title_format', __('Protected: %s')); - $title = sprintf($protected_title_format, $title); - } else if ( isset($post->post_status) && 'private' == $post->post_status ) { - $private_title_format = apply_filters('private_title_format', __('Private: %s')); - $title = sprintf($private_title_format, $title); +function get_the_title( $post = 0 ) { + $post = get_post( $post ); + + $title = isset( $post->post_title ) ? $post->post_title : ''; + $id = isset( $post->ID ) ? $post->ID : 0; + + if ( ! is_admin() ) { + if ( ! empty( $post->post_password ) ) { + $protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ) ); + $title = sprintf( $protected_title_format, $title ); + } else if ( isset( $post->post_status ) && 'private' == $post->post_status ) { + $private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ) ); + $title = sprintf( $private_title_format, $title ); } } + return apply_filters( 'the_title', $title, $id ); } @@ -148,7 +148,7 @@ function the_guid( $id = 0 ) { * @return string */ function get_the_guid( $id = 0 ) { - $post = &get_post($id); + $post = get_post($id); return apply_filters('get_the_guid', $post->guid); } @@ -159,12 +159,12 @@ function get_the_guid( $id = 0 ) { * @since 0.71 * * @param string $more_link_text Optional. Content for when there is more text. - * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false. + * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false. */ -function the_content($more_link_text = null, $stripteaser = false) { - $content = get_the_content($more_link_text, $stripteaser); - $content = apply_filters('the_content', $content); - $content = str_replace(']]>', ']]>', $content); +function the_content( $more_link_text = null, $strip_teaser = false) { + $content = get_the_content( $more_link_text, $strip_teaser ); + $content = apply_filters( 'the_content', $content ); + $content = str_replace( ']]>', ']]>', $content ); echo $content; } @@ -177,50 +177,57 @@ function the_content($more_link_text = null, $stripteaser = false) { * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false. * @return string */ -function get_the_content($more_link_text = null, $stripteaser = false) { - global $post, $more, $page, $pages, $multipage, $preview; +function get_the_content( $more_link_text = null, $strip_teaser = false ) { + global $page, $more, $preview, $pages, $multipage; + + $post = get_post(); if ( null === $more_link_text ) - $more_link_text = __( '(more...)' ); + $more_link_text = __( '(more…)' ); $output = ''; - $hasTeaser = false; + $has_teaser = false; // If post password required and it doesn't match the cookie. - if ( post_password_required($post) ) - return get_the_password_form(); + if ( post_password_required( $post ) ) + return get_the_password_form( $post ); - if ( $page > count($pages) ) // if the requested page doesn't exist - $page = count($pages); // give them the highest numbered page that DOES exist + if ( $page > count( $pages ) ) // if the requested page doesn't exist + $page = count( $pages ); // give them the highest numbered page that DOES exist - $content = $pages[$page-1]; - if ( preg_match('//', $content, $matches) ) { - $content = explode($matches[0], $content, 2); - if ( !empty($matches[1]) && !empty($more_link_text) ) - $more_link_text = strip_tags(wp_kses_no_null(trim($matches[1]))); + $content = $pages[$page - 1]; + if ( preg_match( '//', $content, $matches ) ) { + $content = explode( $matches[0], $content, 2 ); + if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) + $more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) ); - $hasTeaser = true; + $has_teaser = true; } else { - $content = array($content); + $content = array( $content ); } - if ( (false !== strpos($post->post_content, '') && ((!$multipage) || ($page==1))) ) - $stripteaser = true; + + if ( false !== strpos( $post->post_content, '' ) && ( ! $multipage || $page == 1 ) ) + $strip_teaser = true; + $teaser = $content[0]; - if ( $more && $stripteaser && $hasTeaser ) + + if ( $more && $strip_teaser && $has_teaser ) $teaser = ''; + $output .= $teaser; - if ( count($content) > 1 ) { + + if ( count( $content ) > 1 ) { if ( $more ) { $output .= '' . $content[1]; } else { - if ( ! empty($more_link_text) ) + if ( ! empty( $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); + $output = force_balance_tags( $output ); } - } + if ( $preview ) // preview fix for javascript bug with foreign languages - $output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output); + $output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output ); return $output; } @@ -231,7 +238,7 @@ function get_the_content($more_link_text = null, $stripteaser = false) { * @since 3.1.0 * @access private * @param array $match Match array from preg_replace_callback - * @returns string + * @return string */ function _convert_urlencoded_to_entities( $match ) { return '&#' . base_convert( $match[1], 16, 10 ) . ';'; @@ -259,14 +266,13 @@ function get_the_excerpt( $deprecated = '' ) { if ( !empty( $deprecated ) ) _deprecated_argument( __FUNCTION__, '2.3' ); - global $post; - $output = $post->post_excerpt; - if ( post_password_required($post) ) { - $output = __('There is no excerpt because this is a protected post.'); - return $output; + $post = get_post(); + + if ( post_password_required() ) { + return __( 'There is no excerpt because this is a protected post.' ); } - return apply_filters('get_the_excerpt', $output); + return apply_filters( 'get_the_excerpt', $post->post_excerpt ); } /** @@ -278,7 +284,7 @@ function get_the_excerpt( $deprecated = '' ) { * @return bool */ function has_excerpt( $id = 0 ) { - $post = &get_post( $id ); + $post = get_post( $id ); return ( !empty( $post->post_excerpt ) ); } @@ -321,7 +327,8 @@ function get_post_class( $class = '', $post_id = null ) { return $classes; $classes[] = 'post-' . $post->ID; - $classes[] = $post->post_type; + if ( ! is_admin() ) + $classes[] = $post->post_type; $classes[] = 'type-' . $post->post_type; $classes[] = 'status-' . $post->post_status; @@ -427,17 +434,19 @@ function get_body_class( $class = '' ) { $post = $wp_query->get_queried_object(); $classes[] = 'single'; - $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id); - $classes[] = 'postid-' . $post_id; - - // Post Format - if ( post_type_supports( $post->post_type, 'post-formats' ) ) { - $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 ( isset( $post->post_type ) ) { + $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id); + $classes[] = 'postid-' . $post_id; + + // Post Format + if ( post_type_supports( $post->post_type, 'post-formats' ) ) { + $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() ) { @@ -449,34 +458,45 @@ function get_body_class( $class = '' ) { } elseif ( is_archive() ) { if ( is_post_type_archive() ) { $classes[] = 'post-type-archive'; - $classes[] = 'post-type-archive-' . sanitize_html_class( get_query_var( 'post_type' ) ); + $post_type = get_query_var( 'post_type' ); + if ( is_array( $post_type ) ) + $post_type = reset( $post_type ); + $classes[] = 'post-type-archive-' . sanitize_html_class( $post_type ); } else if ( is_author() ) { $author = $wp_query->get_queried_object(); $classes[] = 'author'; - $classes[] = 'author-' . sanitize_html_class( $author->user_nicename , $author->ID ); - $classes[] = 'author-' . $author->ID; + if ( isset( $author->user_nicename ) ) { + $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->term_id ); - $classes[] = 'category-' . $cat->term_id; + if ( isset( $cat->term_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-' . $tags->term_id; + if ( isset( $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; + if ( isset( $term->term_id ) ) { + $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'; $page_id = $wp_query->get_queried_object_id(); - $post = get_page($page_id); + $post = get_post($page_id); $classes[] = 'page-id-' . $page_id; @@ -498,8 +518,10 @@ function get_body_class( $class = '' ) { if ( is_user_logged_in() ) $classes[] = 'logged-in'; - if ( is_admin_bar_showing() ) + if ( is_admin_bar_showing() ) { $classes[] = 'admin-bar'; + $classes[] = 'no-customize-support'; + } if ( get_theme_mod( 'background_color' ) || get_background_image() ) $classes[] = 'custom-background'; @@ -549,12 +571,10 @@ function get_body_class( $class = '' ) { * * @since 2.7.0 * - * @param int|object $post An optional post. Global $post used if not provided. + * @param int|WP_Post $post An optional post. Global $post used if not provided. * @return bool false if a password is not required or the correct password cookie is present, true otherwise. */ function post_password_required( $post = null ) { - global $wp_hasher; - $post = get_post($post); if ( empty( $post->post_password ) ) @@ -563,29 +583,14 @@ function post_password_required( $post = null ) { if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) ) return true; - if ( empty( $wp_hasher ) ) { - require_once( ABSPATH . 'wp-includes/class-phpass.php'); - // By default, use the portable hash from phpass - $wp_hasher = new PasswordHash(8, true); - } - - $hash = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ); - - return ! $wp_hasher->CheckPassword( $post->post_password, $hash ); -} + require_once ABSPATH . 'wp-includes/class-phpass.php'; + $hasher = new PasswordHash( 8, true ); -/** - * Display "sticky" CSS class, if a post is sticky. - * - * @since 2.7.0 - * - * @param int $post_id An optional post ID. - */ -function sticky_class( $post_id = null ) { - if ( !is_sticky($post_id) ) - return; + $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ); + if ( 0 !== strpos( $hash, '$P$B' ) ) + return true; - echo " sticky"; + return ! $hasher->CheckPassword( $post->post_password, $hash ); } /** @@ -602,15 +607,6 @@ function sticky_class( $post_id = null ) { * Quicktag one or more times). This tag must be within The Loop. * * The defaults for overwriting are: - * 'next_or_number' - Default is 'number' (string). Indicates whether page - * numbers should be used. Valid values are number and next. - * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page. - * of the bookmark. - * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to - * previous page, if available. - * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in - * the parameter string will be replaced with the page number, so Page % - * generates "Page 1", "Page 2", etc. Defaults to %, just the page number. * 'before' - Default is '

Pages:' (string). The html or text to prepend to * each bookmarks. * 'after' - Default is '

' (string). The html or text to append to each @@ -621,61 +617,76 @@ function sticky_class( $post_id = null ) { * 'link_after' - Default is '' (string). The html or text to append to each * Pages link inside the tag. Also appended to the current item, which * is not linked. + * 'next_or_number' - Default is 'number' (string). Indicates whether page + * numbers should be used. Valid values are number and next. + * 'separator' - Default is ' ' (string). Text used between pagination links. + * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page. + * of the bookmark. + * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to + * previous page, if available. + * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in + * the parameter string will be replaced with the page number, so Page % + * generates "Page 1", "Page 2", etc. Defaults to %, just the page number. + * 'echo' - Default is 1 (integer). When not 0, this triggers the HTML to be + * echoed and then returned. * * @since 1.2.0 - * @access private * * @param string|array $args Optional. Overwrite the defaults. * @return string Formatted output in HTML. */ -function wp_link_pages($args = '') { +function wp_link_pages( $args = '' ) { $defaults = array( - 'before' => '

' . __('Pages:'), 'after' => '

', - 'link_before' => '', 'link_after' => '', - 'next_or_number' => 'number', 'nextpagelink' => __('Next page'), - 'previouspagelink' => __('Previous page'), 'pagelink' => '%', - 'echo' => 1 + 'before' => '

' . __( 'Pages:' ), + 'after' => '

', + 'link_before' => '', + 'link_after' => '', + 'next_or_number' => 'number', + 'separator' => ' ', + 'nextpagelink' => __( 'Next page' ), + 'previouspagelink' => __( 'Previous page' ), + 'pagelink' => '%', + 'echo' => 1 ); $r = wp_parse_args( $args, $defaults ); $r = apply_filters( 'wp_link_pages_args', $r ); extract( $r, EXTR_SKIP ); - global $page, $numpages, $multipage, $more, $pagenow; + global $page, $numpages, $multipage, $more; $output = ''; if ( $multipage ) { if ( 'number' == $next_or_number ) { $output .= $before; - for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) { - $j = str_replace('%',$i,$pagelink); - $output .= ' '; - if ( ($i != $page) || ((!$more) && ($page==1)) ) { - $output .= _wp_link_page($i); - } - $output .= $link_before . $j . $link_after; - if ( ($i != $page) || ((!$more) && ($page==1)) ) - $output .= ''; + for ( $i = 1; $i <= $numpages; $i++ ) { + $link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after; + if ( $i != $page || ! $more && 1 == $page ) + $link = _wp_link_page( $i ) . $link . ''; + $link = apply_filters( 'wp_link_pages_link', $link, $i ); + $output .= $separator . $link; } $output .= $after; - } else { - if ( $more ) { - $output .= $before; - $i = $page - 1; - if ( $i && $more ) { - $output .= _wp_link_page($i); - $output .= $link_before. $previouspagelink . $link_after . ''; - } - $i = $page + 1; - if ( $i <= $numpages && $more ) { - $output .= _wp_link_page($i); - $output .= $link_before. $nextpagelink . $link_after . ''; - } - $output .= $after; + } elseif ( $more ) { + $output .= $before; + $i = $page - 1; + if ( $i ) { + $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . ''; + $link = apply_filters( 'wp_link_pages_link', $link, $i ); + $output .= $separator . $link; + } + $i = $page + 1; + if ( $i <= $numpages ) { + $link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . ''; + $link = apply_filters( 'wp_link_pages_link', $link, $i ); + $output .= $separator . $link; } + $output .= $after; } } + $output = apply_filters( 'wp_link_pages', $output, $args ); + if ( $echo ) echo $output; @@ -692,7 +703,8 @@ function wp_link_pages($args = '') { * @return string Link. */ function _wp_link_page( $i ) { - global $post, $wp_rewrite; + global $wp_rewrite; + $post = get_post(); if ( 1 == $i ) { $url = get_permalink(); @@ -866,7 +878,7 @@ function wp_list_pages($args = '') { * * "; - endif; + echo ""; +} +/** + * Dashboard CSS fixes for 3.8.2. + * + * This function cheaply fixes #WP27082 and #WP26910 in lieu of + * changing the massive wp-admin.css file in a point release. + * This lucky includes file was already receiving an update. + * + * @since 3.8.2 + * @access private + */ +function wp_382_css_hotfix() { + echo ' +'; } +add_action( 'admin_print_styles', 'wp_382_css_hotfix', 30 );