site_iri: comparison web/wp-includes/post-template.php

equal deleted inserted replaced

-:f507feede89a
+:09a1c134465b
 * @uses $post
 *
 * @return int
 */
 function get_the_ID() {
-	global $post;
+	return get_post()->ID;
-	return $post->ID;
 }
 /**
 * Display or retrieve the current post title with optional content.
 *
 * will be displayed before the post title. If the post is private, then
 * "Private" will be located before the post title.
 *
 * @since 0.71
 *
-* @param int $id Optional. Post ID.
+* @param mixed $post Optional. Post ID or object.
 * @return string
 */
-function get_the_title( $id = 0 ) {
+function get_the_title( $post = 0 ) {
-	$post = &get_post($id);
+	$post = get_post( $post );
-	$title = isset($post->post_title) ? $post->post_title : '';
+	$title = isset( $post->post_title ) ? $post->post_title : '';
-	$id = isset($post->ID) ? $post->ID : (int) $id;
+	$id = isset( $post->ID ) ? $post->ID : 0;
-	if ( !is_admin() ) {
+	if ( ! is_admin() ) {
-		if ( !empty($post->post_password) ) {
+		if ( ! empty( $post->post_password ) ) {
-			$protected_title_format = apply_filters('protected_title_format', __('Protected: %s'));
+			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ) );
-			$title = sprintf($protected_title_format, $title);
+			$title = sprintf( $protected_title_format, $title );
-		} else if ( isset($post->post_status) && 'private' == $post->post_status ) {
+		} else if ( isset( $post->post_status ) && 'private' == $post->post_status ) {
-			$private_title_format = apply_filters('private_title_format', __('Private: %s'));
+			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ) );
-			$title = sprintf($private_title_format, $title);
+			$title = sprintf( $private_title_format, $title );
 		}
 	}
 	return apply_filters( 'the_title', $title, $id );
 }
 /**
 * Display the Post Global Unique Identifier (guid).
 *
 * @param int $id Optional. Post ID.
 * @return string
 */
 function get_the_guid( $id = 0 ) {
-	$post = &get_post($id);
+	$post = get_post($id);
 	return apply_filters('get_the_guid', $post->guid);
 }
 /**
 *
 * @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.
 * @return string
 */
-function get_the_content($more_link_text = null, $stripteaser = false) {
+function get_the_content( $more_link_text = null, $stripteaser = false ) {
-	global $post, $more, $page, $pages, $multipage, $preview;
+	global $more, $page, $pages, $multipage, $preview;
+	$post = get_post();
 	if ( null === $more_link_text )
 		$more_link_text = __( '(more...)' );
 	$output = '';
 	$hasTeaser = false;
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required($post) )
+	if ( post_password_required() )
 		return get_the_password_form();
 	if ( $page > count($pages) ) // if the requested page doesn't exist
 		$page = count($pages); // give them the highest numbered page that DOES exist
 * 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
+* @return string
 */
 function _convert_urlencoded_to_entities( $match ) {
 	return '&#' . base_convert( $match[1], 16, 10 ) . ';';
 }
 */
 function get_the_excerpt( $deprecated = '' ) {
 	if ( !empty( $deprecated ) )
 		_deprecated_argument( __FUNCTION__, '2.3' );
-	global $post;
+	$post = get_post();
-	$output = $post->post_excerpt;
-	if ( post_password_required($post) ) {
+	if ( post_password_required() ) {
-		$output = __('There is no excerpt because this is a protected post.');
+		return __( 'There is no excerpt because this is a protected post.' );
-		return $output;
+	}
-	}
+	return apply_filters( 'get_the_excerpt', $post->post_excerpt );
-	return apply_filters('get_the_excerpt', $output);
 }
 /**
 * Whether post has excerpt.
 *
 *
 * @param int $id Optional. Post ID.
 * @return bool
 */
 function has_excerpt( $id = 0 ) {
-	$post = &get_post( $id );
+	$post = get_post( $id );
 	return ( !empty( $post->post_excerpt ) );
 }
 /**
 * Display the classes for the post div.
 	if ( empty($post) )
 		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;
 	// Post Format
 	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 	if ( is_single() ) {
 		$post_id = $wp_query->get_queried_object_id();
 		$post = $wp_query->get_queried_object();
 		$classes[] = 'single';
-		$classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
+		if ( isset( $post->post_type ) ) {
-		$classes[] = 'postid-' . $post_id;
+			$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
-			$post_format = get_post_format( $post->ID );
+			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 );
+				if ( $post_format && !is_wp_error($post_format) )
-			else
+					$classes[] = 'single-format-' . sanitize_html_class( $post_format );
-				$classes[] = 'single-format-standard';
+				else
+					$classes[] = 'single-format-standard';
+			}
 		}
 		if ( is_attachment() ) {
 			$mime_type = get_post_mime_type($post_id);
 			$mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
 			$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->ID );
+			if ( isset( $author->user_nicename ) ) {
-			$classes[] = 'author-' . $author->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->term_id );
+			if ( isset( $cat->term_id ) ) {
-			$classes[] = 'category-' . $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 );
+			if ( isset( $tags->term_id ) ) {
-			$classes[] = 'tag-' . $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 );
+			if ( isset( $term->term_id ) ) {
-			$classes[] = 'term-' . sanitize_html_class( $term->slug, $term->term_id );
+				$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-			$classes[] = 'term-' . $term->term_id;
+				$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;
 		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 ( 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';
 	$page = $wp_query->get( 'page' );
 	}
 	$hash = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
 	return ! $wp_hasher->CheckPassword( $post->post_password, $hash );
-}
-/**
-* 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;
-	echo " sticky";
 }
 /**
 * Page Template Functions for usage in Themes
 *
 *
 * @param int $i Page number.
 * @return string Link.
 */
 function _wp_link_page( $i ) {
-	global $post, $wp_rewrite;
+	global $wp_rewrite;
+	$post = get_post();
 	if ( 1 == $i ) {
 		$url = get_permalink();
 	} else {
 		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
 * </ul>
 *
 * @since 2.7.0
 *
 * @param array|string $args
+* @return string html menu
 */
 function wp_page_menu( $args = array() ) {
 	$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 );
 		$walker = new Walker_Page;
 	else
 		$walker = $r['walker'];
 	$args = array($pages, $depth, $r, $current_page);
-	return call_user_func_array(array(&$walker, 'walk'), $args);
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 /**
 * Retrieve HTML dropdown (select) content for page list.
 *
 	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
 	else
 		$walker = $args[2]['walker'];
-	return call_user_func_array(array(&$walker, 'walk'), $args);
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 /**
 * Create HTML list of pages.
 *
 	 * @see Walker::start_lvl()
 	 * @since 2.1.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param int $depth Depth of page. Used for padding.
+	 * @param array $args
 	 */
 	function start_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "\n$indent<ul class='children'>\n";
 	}
 	 * @see Walker::end_lvl()
 	 * @since 2.1.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param int $depth Depth of page. Used for padding.
+	 * @param array $args
 	 */
 	function end_lvl( &$output, $depth = 0, $args = array() ) {
 		$indent = str_repeat("\t", $depth);
 		$output .= "$indent</ul>\n";
 	}
 			$indent = '';
 		extract($args, EXTR_SKIP);
 		$css_class = array('page_item', 'page-item-'.$page->ID);
 		if ( !empty($current_page) ) {
-			$_current_page = get_page( $current_page );
+			$_current_page = get_post( $current_page );
-			_get_post_ancestors($_current_page);
+			if ( in_array( $page->ID, $_current_page->ancestors ) )
-			if ( isset($_current_page->ancestors) && in_array($page->ID, (array) $_current_page->ancestors) )
 				$css_class[] = 'current_page_ancestor';
 			if ( $page->ID == $current_page )
 				$css_class[] = 'current_page_item';
 			elseif ( $_current_page && $page->ID == $_current_page->post_parent )
 				$css_class[] = 'current_page_parent';
 	 * @since 2.1.0
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param object $page Page data object. Not used.
 	 * @param int $depth Depth of page. Not Used.
+	 * @param array $args
 	 */
 	function end_el( &$output, $page, $depth = 0, $args = array() ) {
 		$output .= "</li>\n";
 	}
 	 *
 	 * @param string $output Passed by reference. Used to append additional content.
 	 * @param object $page Page data object.
 	 * @param int $depth Depth of page in reference to parent pages. Used for padding.
 	 * @param array $args Uses 'selected' argument for selected page to set selected HTML attribute for option element.
+	 * @param int $id
 	 */
 	function start_el(&$output, $page, $depth, $args, $id = 0) {
 		$pad = str_repeat('&nbsp;', $depth * 3);
 		$output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
 *
 * @param int $id Optional. Post ID.
 * @param string $size Optional, default is 'thumbnail'. Size of image, either array or string.
 * @param bool $permalink Optional, default is false. Whether to add permalink to image.
 * @param bool $icon Optional, default is false. Whether to include icon.
-* @param string $text Optional, default is false. If string, then will be link text.
+* @param string|bool $text Optional, default is false. If string, then will be link text.
 * @return string HTML content.
 */
 function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) {
 	$id = intval( $id );
-	$_post = & get_post( $id );
+	$_post = get_post( $id );
 	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
 		return __( 'Missing Attachment' );
 	if ( $permalink )
 *
 * @param string $content
 * @return string
 */
 function prepend_attachment($content) {
-	global $post;
+	$post = get_post();
 	if ( empty($post->post_type) || $post->post_type != 'attachment' )
 		return $content;
 	$p = '<p class="attachment">';
 * @uses apply_filters() Calls 'the_password_form' filter on output.
 *
 * @return string HTML content for password form for password protected post.
 */
 function get_the_password_form() {
-	global $post;
+	$post = get_post();
 	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
 	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" method="post">
 	<p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
 	<p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__("Submit") . '" /></p>
 </form>
 /**
 * Get the specific template name for a page.
 *
 * @since 3.4.0
 *
-* @param int $id The page ID to check. Defaults to the current post, when used in the loop.
+* @param int $post_id The page ID to check. Defaults to the current post, when used in the loop.
 * @return string|bool Page template filename. Returns an empty string when the default page template
 * 	is in use. Returns false if the post is not a page.
 */
 function get_page_template_slug( $post_id = null ) {
 	$post = get_post( $post_id );
 	<col style="width: 33%" />
 	<col style="width: 33%" />
 	<col style="width: 33%" />
 <thead>
 <tr>
-	<th scope="col"><?php /* translators: column name in revisons */ _ex( 'Old', 'revisions column name' ); ?></th>
+	<th scope="col"><?php /* translators: column name in revisions */ _ex( 'Old', 'revisions column name' ); ?></th>
-	<th scope="col"><?php /* translators: column name in revisons */ _ex( 'New', 'revisions column name' ); ?></th>
+	<th scope="col"><?php /* translators: column name in revisions */ _ex( 'New', 'revisions column name' ); ?></th>
-	<th scope="col"><?php /* translators: column name in revisons */ _ex( 'Date Created', 'revisions column name' ); ?></th>
+	<th scope="col"><?php /* translators: column name in revisions */ _ex( 'Date Created', 'revisions column name' ); ?></th>
 	<th scope="col"><?php _e( 'Author' ); ?></th>
 	<th scope="col" class="action-links"><?php _e( 'Actions' ); ?></th>
 </tr>
 </thead>
 <tbody>

changeset 204	09a1c134465b
parent 194	32102edaa81b