* @return int
*/
function get_the_ID() {
- global $post;
- return $post->ID;
+ return get_post()->ID;
}
/**
* @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));
*
* @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 );
}
* @return string
*/
function get_the_guid( $id = 0 ) {
- $post = &get_post($id);
+ $post = get_post($id);
return apply_filters('get_the_guid', $post->guid);
}
* @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;
}
* @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('/<!--more(.*?)?-->/', $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( '/<!--more(.*?)?-->/', $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, '<!--noteaser-->') && ((!$multipage) || ($page==1))) )
- $stripteaser = true;
+
+ if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $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 .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
} else {
- if ( ! empty($more_link_text) )
+ if ( ! empty( $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);
+ $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;
}
* @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 ) . ';';
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 );
}
/**
* @return bool
*/
function has_excerpt( $id = 0 ) {
- $post = &get_post( $id );
+ $post = get_post( $id );
return ( !empty( $post->post_excerpt ) );
}
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 = $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() ) {
} 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;
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';
*
* @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 ) )
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);
- }
+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $hasher = new PasswordHash( 8, true );
- $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;
+ $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+ if ( 0 !== strpos( $hash, '$P$B' ) )
+ return true;
- echo " sticky";
+ return ! $hasher->CheckPassword( $post->post_password, $hash );
}
/**
* 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 '<p> Pages:' (string). The html or text to prepend to
* each bookmarks.
* 'after' - Default is '</p>' (string). The html or text to append to each
* 'link_after' - Default is '' (string). The html or text to append to each
* Pages link inside the <a> 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' => '<p>' . __('Pages:'), 'after' => '</p>',
- 'link_before' => '', 'link_after' => '',
- 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
- 'previouspagelink' => __('Previous page'), 'pagelink' => '%',
- 'echo' => 1
+ 'before' => '<p>' . __( 'Pages:' ),
+ 'after' => '</p>',
+ 'link_before' => '',
+ 'link_after' => '',
+ 'next_or_number' => 'number',
+ 'separator' => ' ',
+ 'nextpagelink' => __( 'Next page' ),
+ 'previouspagelink' => __( 'Previous page' ),
+ 'pagelink' => '%',
+ 'echo' => 1
);
$r = wp_parse_args( $args, $defaults );
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 .= '</a>';
+ 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 . '</a>';
+ $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 . '</a>';
- }
- $i = $page + 1;
- if ( $i <= $numpages && $more ) {
- $output .= _wp_link_page($i);
- $output .= $link_before. $nextpagelink . $link_after . '</a>';
- }
- $output .= $after;
+ } elseif ( $more ) {
+ $output .= $before;
+ $i = $page - 1;
+ if ( $i ) {
+ $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '</a>';
+ $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 . '</a>';
+ $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;
* @return string Link.
*/
function _wp_link_page( $i ) {
- global $post, $wp_rewrite;
+ global $wp_rewrite;
+ $post = get_post();
if ( 1 == $i ) {
$url = get_permalink();
* @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' => '');
$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);
}
/**
else
$walker = $args[2]['walker'];
- return call_user_func_array(array(&$walker, 'walk'), $args);
+ return call_user_func_array(array($walker, 'walk'), $args);
}
/**
*
* @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);
*
* @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);
* @param int $current_page Page ID.
* @param array $args
*/
- function start_el( &$output, $page, $depth, $args, $current_page = 0 ) {
+ function start_el( &$output, $page, $depth = 0, $args = array(), $current_page = 0 ) {
if ( $depth )
$indent = str_repeat("\t", $depth);
else
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) )
+ $_current_page = get_post( $current_page );
+ if ( in_array( $page->ID, $_current_page->ancestors ) )
$css_class[] = 'current_page_ancestor';
if ( $page->ID == $current_page )
$css_class[] = 'current_page_item';
$css_class = implode( ' ', apply_filters( 'page_css_class', $css_class, $page, $depth, $args, $current_page ) );
+ if ( '' === $page->post_title )
+ $page->post_title = sprintf( __( '#%d (no title)' ), $page->ID );
+
$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) ) {
* @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 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) {
+ function start_el( &$output, $page, $depth = 0, $args = array(), $id = 0 ) {
$pad = str_repeat(' ', $depth * 3);
$output .= "\t<option class=\"level-$depth\" value=\"$page->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' );
* @return string
*/
function prepend_attachment($content) {
- global $post;
+ $post = get_post();
if ( empty($post->post_type) || $post->post_type != 'attachment' )
return $content;
*
* @since 1.0.0
* @uses apply_filters() Calls 'the_password_form' filter on output.
- *
+ * @param int|WP_Post $post Optional. A post id or post object. Defaults to the current post when in The Loop, undefined otherwise.
* @return string HTML content for password form for password protected post.
*/
-function get_the_password_form() {
- global $post;
+function get_the_password_form( $post = 0 ) {
+ $post = get_post( $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>
* @uses $wp_query
*
* @param string $template The specific template name if specific matching is required.
- * @return bool False on failure, true if success.
+ * @return bool True on success, false on failure.
*/
function is_page_template( $template = '' ) {
if ( ! is_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 Optional. 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 )
+ if ( ! $post || 'page' != $post->post_type )
return false;
$template = get_post_meta( $post->ID, '_wp_page_template', true );
if ( ! $template || 'default' == $template )
/* translators: revision date format, see http://php.net/date */
$datef = _x( 'j F, Y @ G:i', 'revision date format');
/* translators: 1: date */
- $autosavef = __( '%1$s [Autosave]' );
+ $autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
/* translators: 1: date */
- $currentf = __( '%1$s [Current Revision]' );
+ $currentf = _x( '%1$s [Current Revision]', 'post revision title extra' );
$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
return $date;
}
+/**
+ * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
+ *
+ * @package WordPress
+ * @subpackage Post_Revisions
+ * @since 3.6.0
+ *
+ * @uses date_i18n()
+ *
+ * @param int|object $revision Revision ID or revision object.
+ * @param bool $link Optional, default is true. Link to revisions's page?
+ * @return string gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
+ */
+function wp_post_revision_title_expanded( $revision, $link = true ) {
+ if ( !$revision = get_post( $revision ) )
+ return $revision;
+
+ if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+ return false;
+
+ $author = get_the_author_meta( 'display_name', $revision->post_author );
+ /* translators: revision date format, see http://php.net/date */
+ $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+
+ $gravatar = get_avatar( $revision->post_author, 24 );
+
+ $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>";
+
+ $revision_date_author = sprintf(
+ /* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
+ _x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
+ $gravatar,
+ $author,
+ human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
+ $date
+ );
+
+ $autosavef = __( '%1$s [Autosave]' );
+ $currentf = __( '%1$s [Current Revision]' );
+
+ if ( !wp_is_post_revision( $revision ) )
+ $revision_date_author = sprintf( $currentf, $revision_date_author );
+ elseif ( wp_is_post_autosave( $revision ) )
+ $revision_date_author = sprintf( $autosavef, $revision_date_author );
+
+ return $revision_date_author;
+}
+
/**
* Display list of a post's revisions.
*
* Can output either a UL with edit links or a TABLE with diff interface, and
* restore action links.
*
- * 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'
- * outputs TABLE with UI.
- * (int) right : what revision is currently being viewed - used in
- * form-table format.
- * (int) left : what revision is currently being diffed against right -
- * used in form-table format.
- *
* @package WordPress
* @subpackage Post_Revisions
* @since 2.6.0
*
* @uses wp_get_post_revisions()
- * @uses wp_post_revision_title()
+ * @uses wp_post_revision_title_expanded()
* @uses get_edit_post_link()
* @uses get_the_author_meta()
*
- * @todo split into two functions (list, form-table) ?
- *
* @param int|object $post_id Post ID or post object.
- * @param string|array $args See description {@link wp_parse_args()}.
+ * @param string $type 'all' (default), 'revision' or 'autosave'
* @return null
*/
-function wp_list_post_revisions( $post_id = 0, $args = null ) {
- if ( !$post = get_post( $post_id ) )
+function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
+ if ( ! $post = get_post( $post_id ) )
return;
- $defaults = array( 'parent' => false, 'right' => false, 'left' => false, 'format' => 'list', 'type' => 'all' );
- 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;
+ // $args array with (parent, format, right, left, type) deprecated since 3.6
+ if ( is_array( $type ) ) {
+ $type = ! empty( $type['type'] ) ? $type['type'] : $type;
+ _deprecated_argument( __FUNCTION__, '3.6' );
}
- /* translators: post revision: 1: when, 2: author name */
- $titlef = _x( '%1$s by %2$s', 'post revision' );
-
- if ( $parent )
- array_unshift( $revisions, $post );
+ if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+ return;
- $rows = $right_checked = '';
- $class = false;
- $can_edit_post = current_user_can( 'edit_post', $post->ID );
+ $rows = '';
foreach ( $revisions as $revision ) {
- if ( !current_user_can( 'read_post', $revision->ID ) )
+ if ( ! current_user_can( 'read_post', $revision->ID ) )
continue;
- if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
- continue;
-
- $date = wp_post_revision_title( $revision );
- $name = get_the_author_meta( 'display_name', $revision->post_author );
- if ( 'form-table' == $format ) {
- if ( $left )
- $left_checked = $left == $revision->ID ? ' checked="checked"' : '';
- else
- $left_checked = $right_checked ? ' checked="checked"' : ''; // [sic] (the next one)
- $right_checked = $right == $revision->ID ? ' checked="checked"' : '';
-
- $class = $class ? '' : " class='alternate'";
+ $is_autosave = wp_is_post_autosave( $revision );
+ if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
+ continue;
- if ( $post->ID != $revision->ID && $can_edit_post )
- $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 /></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";
- $rows .= "</tr>\n";
- } else {
- $title = sprintf( $titlef, $date, $name );
- $rows .= "\t<li>$title</li>\n";
- }
+ $rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
}
- if ( 'form-table' == $format ) : ?>
-
-<form action="revision.php" method="get">
-
-<div class="tablenav">
- <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" id="post-revisions">
- <col />
- <col />
- <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 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>
-</thead>
-<tbody>
-
-<?php echo $rows; ?>
-
-</tbody>
-</table>
-
-</form>
-
-<?php
- else :
- echo "<ul class='post-revisions'>\n";
- echo $rows;
+ echo "<div class='hide-if-js'><p>" . __( 'JavaScript must be enabled to use this feature.' ) . "</p></div>\n";
+
+ echo "<ul class='post-revisions hide-if-no-js'>\n";
+ echo $rows;
+
+ // if the post was previously restored from a revision
+ // show the restore event details
+ if ( $restored_from_meta = get_post_meta( $post->ID, '_post_restored_from', true ) ) {
+ $author = get_user_by( 'id', $restored_from_meta[ 'restored_by_user' ] );
+ /* translators: revision date format, see http://php.net/date */
+ $datef = _x( 'j F, Y @ G:i:s', 'revision date format');
+ $date = date_i18n( $datef, strtotime( $restored_from_meta[ 'restored_time' ] ) );
+ $time_diff = human_time_diff( $restored_from_meta[ 'restored_time' ] ) ;
+ ?>
+ <hr />
+ <div id="revisions-meta-restored">
+ <?php
+ printf(
+ /* translators: restored revision details: 1: gravatar image, 2: author name, 3: time ago, 4: date */
+ __( 'Previously restored by %1$s %2$s, %3$s ago (%4$s)' ),
+ get_avatar( $author->ID, 24 ),
+ $author->display_name,
+ $time_diff,
+ $date
+ );
+ ?>
+ </div>
+ <?php
echo "</ul>";
- endif;
+ }
}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff