--- a/web/wp-includes/post-template.php Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-includes/post-template.php Mon Nov 19 18:26:13 2012 +0100
@@ -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;
}
/**
@@ -81,7 +79,6 @@
$r = wp_parse_args($args, $defaults);
extract( $r, EXTR_SKIP );
-
$title = $before . $title . $after;
$title = esc_attr(strip_tags($title));
@@ -106,7 +103,8 @@
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 +115,7 @@
$title = sprintf($private_title_format, $title);
}
}
- return apply_filters( 'the_title', $title, $post->ID );
+ return apply_filters( 'the_title', $title, $id );
}
/**
@@ -127,12 +125,14 @@
* 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 ) );
}
/**
@@ -159,9 +159,9 @@
* @since 0.71
*
* @param string $more_link_text Optional. Content for when there is more text.
- * @param string $stripteaser Optional. Teaser content before the more text.
+ * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false.
*/
-function the_content($more_link_text = null, $stripteaser = 0) {
+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);
@@ -174,11 +174,11 @@
* @since 0.71
*
* @param string $more_link_text Optional. Content for when there is more text.
- * @param string $stripteaser Optional. Teaser content before the 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 = 0) {
- global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
+function get_the_content($more_link_text = null, $stripteaser = false) {
+ global $post, $more, $page, $pages, $multipage, $preview;
if ( null === $more_link_text )
$more_link_text = __( '(more...)' );
@@ -187,10 +187,8 @@
$hasTeaser = false;
// If post password required and it doesn't match the cookie.
- if ( post_password_required($post) ) {
- $output = get_the_password_form();
- return $output;
- }
+ if ( post_password_required($post) )
+ 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
@@ -206,28 +204,40 @@
$content = array($content);
}
if ( (false !== strpos($post->post_content, '<!--noteaser-->') && ((!$multipage) || ($page==1))) )
- $stripteaser = 1;
+ $stripteaser = true;
$teaser = $content[0];
- if ( ($more) && ($stripteaser) && ($hasTeaser) )
+ if ( $more && $stripteaser && $hasTeaser )
$teaser = '';
$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.
*
* @since 0.71
@@ -245,7 +255,10 @@
* @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 +322,46 @@
$classes[] = 'post-' . $post->ID;
$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' ) ) {
+ $post_format = get_post_format( $post->ID );
+
+ 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 +372,7 @@
$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 +396,11 @@
* @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() )
@@ -378,8 +411,10 @@
$classes[] = 'archive';
if ( is_date() )
$classes[] = 'date';
- if ( is_search() )
+ if ( is_search() ) {
$classes[] = 'search';
+ $classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
+ }
if ( is_paged() )
$classes[] = 'paged';
if ( is_attachment() )
@@ -388,67 +423,91 @@
$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
+ 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() ) {
- $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();
+
+ $post = get_page($page_id);
- $pageID = $wp_query->post->ID;
+ $classes[] = 'page-id-' . $page_id;
- $classes[] = 'page-id-' . $pageID;
-
- 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_page_template_slug( $page_id ) ) );
+ } else {
+ $classes[] = 'page-template-default';
}
- } elseif ( is_search() ) {
- if ( !empty($wp_query->posts) )
- $classes[] = 'search-results';
- else
- $classes[] = 'search-no-results';
}
if ( is_user_logged_in() )
$classes[] = 'logged-in';
- $page = $wp_query->get('page');
+ if ( is_admin_bar_showing() )
+ $classes[] = 'admin-bar';
+
+ if ( get_theme_mod( 'background_color' ) || get_background_image() )
+ $classes[] = 'custom-background';
+
+ $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 +526,22 @@
$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 );
+ } else {
+ // Ensure that we always coerce class to being an array.
+ $class = array();
}
- $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 );
}
/**
@@ -485,22 +549,29 @@
*
* @since 2.7.0
*
- * @param int|object $post An optional post. Global $post used if not provided.
+ * @param int|object $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) )
+ if ( empty( $post->post_password ) )
return false;
- if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
+ if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
return true;
- if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
- 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);
+ }
- return false;
+ $hash = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+
+ return ! $wp_hasher->CheckPassword( $post->post_password, $hash );
}
/**
@@ -545,9 +616,11 @@
* '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 +638,22 @@
);
$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() . '&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 +663,13 @@
$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() . '&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() . '&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 +682,31 @@
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 +718,14 @@
* @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 +743,7 @@
echo "<ul class='post-meta'>\n";
foreach ( (array) $keys as $key ) {
$keyt = trim($key);
- if ( '_' == $keyt{0} )
+ if ( is_protected_meta( $keyt, 'post' ) )
continue;
$values = array_map('trim', get_post_custom_values($key));
$value = implode($values,', ');
@@ -690,7 +769,8 @@
$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' => ''
);
@@ -699,10 +779,12 @@
$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='" . esc_attr( $name ) . "' id='" . esc_attr( $id ) . "'>\n";
if ( $show_option_no_change )
$output .= "\t<option value=\"-1\">$show_option_no_change</option>";
if ( $show_option_none )
@@ -810,7 +892,7 @@
$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 +900,7 @@
$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 +965,157 @@
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 = 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.
+ */
+ function end_lvl( &$output, $depth = 0, $args = array() ) {
+ $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 = 0 ) {
+ 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, $depth, $args, $current_page ) );
+
+ $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_permalink($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 = 0, $args = array() ) {
+ $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, $id = 0) {
+ $pad = str_repeat(' ', $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, $page );
+ $output .= $pad . esc_html( $title );
+ $output .= "</option>\n";
+ }
+}
+
//
// Attachments
//
@@ -897,7 +1130,10 @@
* @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
@@ -917,183 +1153,32 @@
* @param string $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);
+function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false ) {
+ $id = intval( $id );
$_post = & get_post( $id );
- if ( ('attachment' != $_post->post_type) || !$url = wp_get_attachment_url($_post->ID) )
- return __('Missing Attachment');
+ if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
+ return __( 'Missing Attachment' );
if ( $permalink )
- $url = get_attachment_link($_post->ID);
+ $url = get_attachment_link( $_post->ID );
- $post_title = esc_attr($_post->post_title);
+ $post_title = esc_attr( $_post->post_title );
- if ( $text ) {
- $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);
- }
+ if ( $text )
+ $link_text = $text;
+ elseif ( $size && 'none' != $size )
+ $link_text = wp_get_attachment_image( $id, $size, $icon );
+ else
+ $link_text = '';
- if( trim($link_text) == '' )
+ if ( trim( $link_text ) == '' )
$link_text = $_post->post_title;
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.
*
* @since 2.0.0
@@ -1131,11 +1216,11 @@
*/
function get_the_password_form() {
global $post;
- $label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
- $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="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>
+</form>
';
return apply_filters('the_password_form', $output);
}
@@ -1143,8 +1228,8 @@
/**
* 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
@@ -1153,30 +1238,44 @@
* @param string $template The specific template name if specific matching is required.
* @return bool False on failure, true if success.
*/
-function is_page_template($template = '') {
- if (!is_page()) {
+function is_page_template( $template = '' ) {
+ if ( ! is_page() )
return false;
- }
- global $wp_query;
+ $page_template = get_page_template_slug( get_queried_object_id() );
- $page = $wp_query->get_queried_object();
- $custom_fields = get_post_custom_values('_wp_page_template',$page->ID);
- $page_template = $custom_fields[0];
+ if ( empty( $template ) )
+ return (bool) $page_template;
- // We have no argument passed so just see if a page_template has been specified
- if ( empty( $template ) ) {
- if (!empty( $page_template ) ) {
- return true;
- }
- } elseif ( $template == $page_template) {
+ if ( $template == $page_template )
return true;
- }
+
+ if ( 'default' == $template && ! $page_template )
+ return true;
return false;
}
/**
+ * 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.
+ * @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 );
+ if ( 'page' != $post->post_type )
+ return false;
+ $template = get_post_meta( $post->ID, '_wp_page_template', true );
+ if ( ! $template || 'default' == $template )
+ return '';
+ return $template;
+}
+
+/**
* Retrieve formatted date timestamp of a revision (linked to that revisions's page).
*
* @package WordPress
@@ -1203,7 +1302,7 @@
/* 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>";
@@ -1223,7 +1322,7 @@
*
* Second argument controls parameters:
* (bool) parent : include the parent (the "Current Revision") in the list.
- * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
+ * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
* outputs TABLE with UI.
* (int) right : what revision is currently being viewed - used in
* form-table format.
@@ -1253,17 +1352,17 @@
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 */
@@ -1272,7 +1371,7 @@
if ( $parent )
array_unshift( $revisions, $post );
- $rows = '';
+ $rows = $right_checked = '';
$class = false;
$can_edit_post = current_user_can( 'edit_post', $post->ID );
foreach ( $revisions as $revision ) {
@@ -1294,12 +1393,13 @@
$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 +1418,23 @@
<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>