X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..e9d988989fe37ab8c5f903e47fbe36e6e00dc51f:/wp-includes/post-template.php

diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 9b6efcda..98b6fede 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 ) );
 }
 
 /**
@@ -178,7 +179,7 @@ function the_content($more_link_text = null, $stripteaser = 0) {
  * @return string
  */
 function get_the_content($more_link_text = null, $stripteaser = 0) {
-	global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
+	global $post, $more, $page, $pages, $multipage, $preview;
 
 	if ( null === $more_link_text )
 		$more_link_text = __( '(more...)' );
@@ -213,20 +214,32 @@ function get_the_content($more_link_text = null, $stripteaser = 0) {
 	$output .= $teaser;
 	if ( count($content) > 1 ) {
 		if ( $more ) {
-			$output .= '<span id="more-' . $id . '"></span>' . $content[1];
+			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
 			if ( ! empty($more_link_text) )
-				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-$id\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $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.
  *
@@ -245,7 +258,10 @@ 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 = $post->post_excerpt;
 	if ( post_password_required($post) ) {
@@ -309,26 +325,46 @@ function get_post_class( $class = '', $post_id = null ) {
 
 	$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) ) {
@@ -339,7 +375,7 @@ function get_post_class( $class = '', $post_id = null ) {
 
 	$classes = array_map('esc_attr', $classes);
 
-	return apply_filters('post_class', $classes, $class, $post_id);
+	return apply_filters('post_class', $classes, $class, $post->ID);
 }
 
 /**
@@ -363,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() )
@@ -388,55 +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();
+
+		$classes[] = 'single';
+		$classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
+		$classes[] = 'postid-' . $post_id;
 
-		$postID = $wp_query->post->ID;
-		$classes[] = 'single postid-' . $postID;
+		// 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->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;
+			$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';
@@ -445,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;
@@ -467,17 +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 );
 	}
 
-	$classes = array_map('esc_attr', $classes);
+	$classes = array_map( 'esc_attr', $classes );
 
-	return apply_filters('body_class', $classes, $class);
+	return apply_filters( 'body_class', $classes, $class );
 }
 
 /**
@@ -545,9 +605,11 @@ function sticky_class( $post_id = null ) {
  * 'after' - Default is '</p>' (string). The html or text to append to each
  *      bookmarks.
  * 'link_before' - Default is '' (string). The html or text to prepend to each
- *      Pages link inside the <a> tag.
+ *      Pages link inside the <a> 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 <a> tag.
+ *      Pages link inside the <a> tag. Also appended to the current item, which
+ *      is not linked.
  *
  * @since 1.2.0
  * @access private
@@ -565,31 +627,22 @@ function wp_link_pages($args = '') {
 	);
 
 	$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;
+	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 .= '<a href="' . get_permalink() . '">';
-					} else {
-						if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-							$output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">';
-						else
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">';
-					}
-
+					$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 .= '</a>';
 			}
@@ -599,25 +652,13 @@ function wp_link_pages($args = '') {
 				$output .= $before;
 				$i = $page - 1;
 				if ( $i && $more ) {
-					if ( 1 == $i ) {
-						$output .= '<a href="' . get_permalink() . '">' . $link_before. $previouspagelink . $link_after . '</a>';
-					} else {
-						if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-							$output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $previouspagelink . $link_after . '</a>';
-						else
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $previouspagelink . $link_after . '</a>';
-					}
+					$output .= _wp_link_page($i);
+					$output .= $link_before. $previouspagelink . $link_after . '</a>';
 				}
 				$i = $page + 1;
 				if ( $i <= $numpages && $more ) {
-					if ( 1 == $i ) {
-						$output .= '<a href="' . get_permalink() . '">' . $link_before. $nextpagelink . $link_after . '</a>';
-					} else {
-						if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-							$output .= '<a href="' . get_permalink() . '&amp;page=' . $i . '">' . $link_before. $nextpagelink . $link_after . '</a>';
-						else
-							$output .= '<a href="' . trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged') . '">' . $link_before. $nextpagelink . $link_after . '</a>';
-					}
+					$output .= _wp_link_page($i);
+					$output .= $link_before. $nextpagelink . $link_after . '</a>';
 				}
 				$output .= $after;
 			}
@@ -630,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 '<a href="' . esc_url( $url ) . '">';
+}
 
 //
 // Post-meta: Custom per-post fields.
@@ -641,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];
@@ -664,7 +732,7 @@ function the_meta() {
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim($key);
-			if ( '_' == $keyt{0} )
+			if ( '_' == $keyt[0] )
 				continue;
 			$values = array_map('trim', get_post_custom_values($key));
 			$value = implode($values,', ');
@@ -690,7 +758,8 @@ function wp_dropdown_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'child_of' => 0,
 		'selected' => 0, 'echo' => 1,
-		'name' => 'page_id', 'show_option_none' => '', 'show_option_no_change' => '',
+		'name' => 'page_id', 'id' => '',
+		'show_option_none' => '', 'show_option_no_change' => '',
 		'option_none_value' => ''
 	);
 
@@ -700,9 +769,12 @@ function wp_dropdown_pages($args = '') {
 	$pages = get_pages($r);
 	$output = '';
 	$name = esc_attr($name);
+	// Back-compat with old system where both id and name were based on $name argument
+	if ( empty($id) )
+		$id = $name;
 
 	if ( ! empty($pages) ) {
-		$output = "<select name=\"$name\" id=\"$name\">\n";
+		$output = "<select name=\"$name\" id=\"$id\">\n";
 		if ( $show_option_no_change )
 			$output .= "\t<option value=\"-1\">$show_option_no_change</option>";
 		if ( $show_option_none )
@@ -810,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
@@ -818,7 +890,7 @@ function wp_page_menu( $args = array() ) {
 		$class = '';
 		if ( is_front_page() && !is_paged() )
 			$class = 'class="current_page_item"';
-		$menu .= '<li ' . $class . '><a href="' . get_option('home') . '" title="' . esc_attr($text) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '" title="' . esc_attr($text) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
 			if ( !empty( $list_args['exclude'] ) ) {
@@ -883,6 +955,157 @@ function walk_page_dropdown_tree() {
 	return call_user_func_array(array(&$walker, 'walk'), $args);
 }
 
+/**
+ * Create HTML list of pages.
+ *
+ * @package WordPress
+ * @since 2.1.0
+ * @uses Walker
+ */
+class Walker_Page extends Walker {
+	/**
+	 * @see Walker::$tree_type
+	 * @since 2.1.0
+	 * @var string
+	 */
+	var $tree_type = 'page';
+
+	/**
+	 * @see Walker::$db_fields
+	 * @since 2.1.0
+	 * @todo Decouple this.
+	 * @var array
+	 */
+	var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
+
+	/**
+	 * @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.
+	 */
+	function start_lvl(&$output, $depth) {
+		$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.
+	 */
+	function end_lvl(&$output, $depth) {
+		$indent = str_repeat("\t", $depth);
+		$output .= "$indent</ul>\n";
+	}
+
+	/**
+	 * @see Walker::start_el()
+	 * @since 2.1.0
+	 *
+	 * @param string $output Passed by reference. Used to append additional content.
+	 * @param object $page Page data object.
+	 * @param int $depth Depth of page. Used for padding.
+	 * @param int $current_page Page ID.
+	 * @param array $args
+	 */
+	function start_el(&$output, $page, $depth, $args, $current_page) {
+		if ( $depth )
+			$indent = str_repeat("\t", $depth);
+		else
+			$indent = '';
+
+		extract($args, EXTR_SKIP);
+		$css_class = array('page_item', 'page-item-'.$page->ID);
+		if ( !empty($current_page) ) {
+			$_current_page = get_page( $current_page );
+			_get_post_ancestors($_current_page);
+			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';
+		} elseif ( $page->ID == get_option('page_for_posts') ) {
+			$css_class[] = 'current_page_parent';
+		}
+
+		$css_class = implode(' ', apply_filters('page_css_class', $css_class, $page));
+
+		$output .= $indent . '<li class="' . $css_class . '"><a href="' . get_permalink($page->ID) . '" title="' . esc_attr( wp_strip_all_tags( apply_filters( 'the_title', $page->post_title, $page->ID ) ) ) . '">' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . '</a>';
+
+		if ( !empty($show_date) ) {
+			if ( 'modified' == $show_date )
+				$time = $page->post_modified;
+			else
+				$time = $page->post_date;
+
+			$output .= " " . mysql2date($date_format, $time);
+		}
+	}
+
+	/**
+	 * @see Walker::end_el()
+	 * @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.
+	 */
+	function end_el(&$output, $page, $depth) {
+		$output .= "</li>\n";
+	}
+
+}
+
+/**
+ * Create HTML dropdown list of pages.
+ *
+ * @package WordPress
+ * @since 2.1.0
+ * @uses Walker
+ */
+class Walker_PageDropdown extends Walker {
+	/**
+	 * @see Walker::$tree_type
+	 * @since 2.1.0
+	 * @var string
+	 */
+	var $tree_type = 'page';
+
+	/**
+	 * @see Walker::$db_fields
+	 * @since 2.1.0
+	 * @todo Decouple this
+	 * @var array
+	 */
+	var $db_fields = array ('parent' => 'post_parent', 'id' => 'ID');
+
+	/**
+	 * @see Walker::start_el()
+	 * @since 2.1.0
+	 *
+	 * @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.
+	 */
+	function start_el(&$output, $page, $depth, $args) {
+		$pad = str_repeat('&nbsp;', $depth * 3);
+
+		$output .= "\t<option class=\"level-$depth\" value=\"$page->ID\"";
+		if ( $page->ID == $args['selected'] )
+			$output .= ' selected="selected"';
+		$output .= '>';
+		$title = apply_filters( 'list_pages', $page->post_title );
+		$output .= $pad . esc_html( $title );
+		$output .= "</option>\n";
+	}
+}
+
 //
 // Attachments
 //
@@ -897,7 +1120,10 @@ function walk_page_dropdown_tree() {
  * @param bool $deprecated Deprecated. Not used.
  * @param bool $permalink Optional, default is false. Whether to include permalink.
  */
-function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $permalink = false) {
+function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
+	if ( !empty( $deprecated ) )
+		_deprecated_argument( __FUNCTION__, '2.5' );
+
 	if ( $fullsize )
 		echo wp_get_attachment_link($id, 'full', $permalink);
 	else
@@ -933,6 +1159,8 @@ function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false
 		$link_text = esc_attr($text);
 	} elseif ( ( is_int($size) && $size != 0 ) or ( is_string($size) && $size != 'none' ) or $size != false ) {
 		$link_text = wp_get_attachment_image($id, $size, $icon);
+	} else {
+		$link_text = '';
 	}
 
 	if( trim($link_text) == '' )
@@ -941,158 +1169,6 @@ function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false
 	return apply_filters( 'wp_get_attachment_link', "<a href='$url' title='$post_title'>$link_text</a>", $id, $size, $permalink, $icon, $text );
 }
 
-/**
- * Retrieve HTML content of attachment image with link.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_link()}
- * @see wp_get_attachment_link() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default is false. Whether to use full size image.
- * @param array $max_dims Optional. Max image dimensions.
- * @param bool $permalink Optional, default is false. Whether to include permalink to image.
- * @return string
- */
-function get_the_attachment_link($id = 0, $fullsize = false, $max_dims = false, $permalink = false) {
-	$id = (int) $id;
-	$_post = & get_post($id);
-
-	if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
-		return __('Missing Attachment');
-
-	if ( $permalink )
-		$url = get_attachment_link($_post->ID);
-
-	$post_title = esc_attr($_post->post_title);
-
-	$innerHTML = get_attachment_innerHTML($_post->ID, $fullsize, $max_dims);
-	return "<a href='$url' title='$post_title'>$innerHTML</a>";
-}
-
-/**
- * Retrieve icon URL and Path.
- *
- * @since 2.1.0
- * @deprecated Use {@link wp_get_attachment_image_src()}
- * @see wp_get_attachment_image_src() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full image.
- * @return array Icon URL and full path to file, respectively.
- */
-function get_attachment_icon_src( $id = 0, $fullsize = false ) {
-	$id = (int) $id;
-	if ( !$post = & get_post($id) )
-		return false;
-
-	$file = get_attached_file( $post->ID );
-
-	if ( !$fullsize && $src = wp_get_attachment_thumb_url( $post->ID ) ) {
-		// We have a thumbnail desired, specified and existing
-
-		$src_file = basename($src);
-		$class = 'attachmentthumb';
-	} elseif ( wp_attachment_is_image( $post->ID ) ) {
-		// We have an image without a thumbnail
-
-		$src = wp_get_attachment_url( $post->ID );
-		$src_file = & $file;
-		$class = 'attachmentimage';
-	} elseif ( $src = wp_mime_type_icon( $post->ID ) ) {
-		// No thumb, no image. We'll look for a mime-related icon instead.
-
-		$icon_dir = apply_filters( 'icon_dir', get_template_directory() . '/images' );
-		$src_file = $icon_dir . '/' . basename($src);
-	}
-
-	if ( !isset($src) || !$src )
-		return false;
-
-	return array($src, $src_file);
-}
-
-/**
- * Retrieve HTML content of icon attachment image element.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_image()}
- * @see wp_get_attachment_image() Use instead of.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full size image.
- * @param array $max_dims Optional. Dimensions of image.
- * @return string HTML content.
- */
-function get_attachment_icon( $id = 0, $fullsize = false, $max_dims = false ) {
-	$id = (int) $id;
-	if ( !$post = & get_post($id) )
-		return false;
-
-	if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
-		return false;
-
-	list($src, $src_file) = $src;
-
-	// Do we need to constrain the image?
-	if ( ($max_dims = apply_filters('attachment_max_dims', $max_dims)) && file_exists($src_file) ) {
-
-		$imagesize = getimagesize($src_file);
-
-		if (($imagesize[0] > $max_dims[0]) || $imagesize[1] > $max_dims[1] ) {
-			$actual_aspect = $imagesize[0] / $imagesize[1];
-			$desired_aspect = $max_dims[0] / $max_dims[1];
-
-			if ( $actual_aspect >= $desired_aspect ) {
-				$height = $actual_aspect * $max_dims[0];
-				$constraint = "width='{$max_dims[0]}' ";
-				$post->iconsize = array($max_dims[0], $height);
-			} else {
-				$width = $max_dims[1] / $actual_aspect;
-				$constraint = "height='{$max_dims[1]}' ";
-				$post->iconsize = array($width, $max_dims[1]);
-			}
-		} else {
-			$post->iconsize = array($imagesize[0], $imagesize[1]);
-			$constraint = '';
-		}
-	} else {
-		$constraint = '';
-	}
-
-	$post_title = esc_attr($post->post_title);
-
-	$icon = "<img src='$src' title='$post_title' alt='$post_title' $constraint/>";
-
-	return apply_filters( 'attachment_icon', $icon, $post->ID );
-}
-
-/**
- * Retrieve HTML content of image element.
- *
- * @since 2.0.0
- * @deprecated Use {@link wp_get_attachment_image()}
- * @see wp_get_attachment_image() Use instead.
- *
- * @param int $id Optional. Post ID.
- * @param bool $fullsize Optional, default to false. Whether to have full size image.
- * @param array $max_dims Optional. Dimensions of image.
- * @return string
- */
-function get_attachment_innerHTML($id = 0, $fullsize = false, $max_dims = false) {
-	$id = (int) $id;
-	if ( !$post = & get_post($id) )
-		return false;
-
-	if ( $innerHTML = get_attachment_icon($post->ID, $fullsize, $max_dims))
-		return $innerHTML;
-
-
-	$innerHTML = esc_attr($post->post_title);
-
-	return apply_filters('attachment_innerHTML', $innerHTML, $post->ID);
-}
-
 /**
  * Wrap attachment in <<p>> element before content.
  *
@@ -1143,8 +1219,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
@@ -1203,7 +1279,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 = "<a href='$link'>$date</a>";
 
@@ -1253,17 +1329,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 */
@@ -1294,12 +1370,13 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
 			$class = $class ? '' : " class='alternate'";
 
 			if ( $post->ID != $revision->ID && $can_edit_post )
-				$actions = '<a href="' . wp_nonce_url( add_query_arg( array( 'revision' => $revision->ID, 'diff' => false, 'action' => 'restore' ) ), "restore-post_$post->ID|$revision->ID" ) . '">' . __( 'Restore' ) . '</a>';
+				$actions = '<a href="' . wp_nonce_url( add_query_arg( array( 'revision' => $revision->ID, 'action' => 'restore' ) ), "restore-post_$post->ID|$revision->ID" ) . '">' . __( 'Restore' ) . '</a>';
 			else
 				$actions = '';
 
 			$rows .= "<tr$class>\n";
-			$rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /><input type='radio' name='right' value='$revision->ID'$right_checked /></th>\n";
+			$rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='left' value='$revision->ID'$left_checked /></th>\n";
+			$rows .= "\t<th style='white-space: nowrap' scope='row'><input type='radio' name='right' value='$revision->ID'$right_checked /></th>\n";
 			$rows .= "\t<td>$date</td>\n";
 			$rows .= "\t<td>$name</td>\n";
 			$rows .= "\t<td class='action-links'>$actions</td>\n";
@@ -1318,20 +1395,23 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) {
 	<div class="alignleft">
 		<input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
 		<input type="hidden" name="action" value="diff" />
+		<input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
 	</div>
 </div>
 
 <br class="clear" />
 
-<table class="widefat post-revisions" cellspacing="0">
+<table class="widefat post-revisions" cellspacing="0" id="post-revisions">
+	<col />
 	<col />
 	<col style="width: 33%" />
 	<col style="width: 33%" />
 	<col style="width: 33%" />
 <thead>
 <tr>
-	<th scope="col"></th>
-	<th scope="col"><?php _e( 'Date Created' ); ?></th>
+	<th scope="col"><?php /* translators: column name in revisons */ _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 revisons */ _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>