X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/baca9ce86a38dc54c4574890ee2d352fd81f78b2..a349837896628462bf8c9bdc27d1477a10fe03eb:/wp-includes/post-template.php
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index d51d0095..37290d5b 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -69,15 +69,15 @@ function the_title($before = '', $after = '', $echo = true) {
* @return string|null Null on failure or display. String when echo is false.
*/
function the_title_attribute( $args = '' ) {
- $title = get_the_title();
+ $defaults = array('before' => '', 'after' => '', 'echo' => true, 'post' => get_post() );
+ $r = wp_parse_args($args, $defaults);
+ extract( $r, EXTR_SKIP );
+
+ $title = get_the_title( $post );
if ( strlen($title) == 0 )
return;
- $defaults = array('before' => '', 'after' => '', 'echo' => true);
- $r = wp_parse_args($args, $defaults);
- extract( $r, EXTR_SKIP );
-
$title = $before . $title . $after;
$title = esc_attr(strip_tags($title));
@@ -96,7 +96,7 @@ function the_title_attribute( $args = '' ) {
*
* @since 0.71
*
- * @param mixed $post Optional. Post ID or object.
+ * @param int|object $post Optional. Post ID or object.
* @return string
*/
function get_the_title( $post = 0 ) {
@@ -159,12 +159,12 @@ function get_the_guid( $id = 0 ) {
* @since 0.71
*
* @param string $more_link_text Optional. Content for when there is more text.
- * @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false.
+ * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
*/
-function the_content($more_link_text = null, $stripteaser = false) {
- $content = get_the_content($more_link_text, $stripteaser);
- $content = apply_filters('the_content', $content);
- $content = str_replace(']]>', ']]>', $content);
+function the_content( $more_link_text = null, $strip_teaser = false) {
+ $content = get_the_content( $more_link_text, $strip_teaser );
+ $content = apply_filters( 'the_content', $content );
+ $content = str_replace( ']]>', ']]>', $content );
echo $content;
}
@@ -177,52 +177,57 @@ function the_content($more_link_text = null, $stripteaser = false) {
* @param bool $stripteaser Optional. Strip teaser content before the more text. Default is false.
* @return string
*/
-function get_the_content( $more_link_text = null, $stripteaser = false ) {
- global $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() )
- return get_the_password_form();
+ if ( post_password_required( $post ) )
+ return get_the_password_form( $post );
- if ( $page > count($pages) ) // if the requested page doesn't exist
- $page = count($pages); // give them the highest numbered page that DOES exist
+ if ( $page > count( $pages ) ) // if the requested page doesn't exist
+ $page = count( $pages ); // give them the highest numbered page that DOES exist
- $content = $pages[$page-1];
- if ( preg_match('//', $content, $matches) ) {
- $content = explode($matches[0], $content, 2);
- if ( !empty($matches[1]) && !empty($more_link_text) )
- $more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
+ $content = $pages[$page - 1];
+ if ( preg_match( '//', $content, $matches ) ) {
+ $content = explode( $matches[0], $content, 2 );
+ if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
+ $more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
- $hasTeaser = true;
+ $has_teaser = true;
} else {
- $content = array($content);
+ $content = array( $content );
}
- if ( (false !== strpos($post->post_content, '') && ((!$multipage) || ($page==1))) )
- $stripteaser = true;
+
+ if ( false !== strpos( $post->post_content, '' ) && ( ! $multipage || $page == 1 ) )
+ $strip_teaser = true;
+
$teaser = $content[0];
- if ( $more && $stripteaser && $hasTeaser )
+
+ if ( $more && $strip_teaser && $has_teaser )
$teaser = '';
+
$output .= $teaser;
- if ( count($content) > 1 ) {
+
+ if ( count( $content ) > 1 ) {
if ( $more ) {
$output .= ' ' . $content[1];
} else {
- if ( ! empty($more_link_text) )
+ if ( ! empty( $more_link_text ) )
$output .= apply_filters( 'the_content_more_link', ' ID}\" class=\"more-link\">$more_link_text ", $more_link_text );
- $output = force_balance_tags($output);
+ $output = force_balance_tags( $output );
}
-
}
+
if ( $preview ) // preview fix for javascript bug with foreign languages
- $output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
+ $output = preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
return $output;
}
@@ -453,7 +458,10 @@ function get_body_class( $class = '' ) {
} elseif ( is_archive() ) {
if ( is_post_type_archive() ) {
$classes[] = 'post-type-archive';
- $classes[] = 'post-type-archive-' . sanitize_html_class( get_query_var( 'post_type' ) );
+ $post_type = get_query_var( 'post_type' );
+ if ( is_array( $post_type ) )
+ $post_type = reset( $post_type );
+ $classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
} else if ( is_author() ) {
$author = $wp_query->get_queried_object();
$classes[] = 'author';
@@ -563,7 +571,7 @@ function get_body_class( $class = '' ) {
*
* @since 2.7.0
*
- * @param int|object $post An optional post. Global $post used if not provided.
+ * @param int|WP_Post $post An optional post. Global $post used if not provided.
* @return bool false if a password is not required or the correct password cookie is present, true otherwise.
*/
function post_password_required( $post = null ) {
@@ -578,7 +586,7 @@ function post_password_required( $post = null ) {
require_once ABSPATH . 'wp-includes/class-phpass.php';
$hasher = new PasswordHash( 8, true );
- $hash = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+ $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
if ( 0 !== strpos( $hash, '$P$B' ) )
return true;
@@ -599,15 +607,6 @@ function post_password_required( $post = null ) {
* Quicktag one or more times). This tag must be within The Loop.
*
* The defaults for overwriting are:
- * 'next_or_number' - Default is 'number' (string). Indicates whether page
- * numbers should be used. Valid values are number and next.
- * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page.
- * of the bookmark.
- * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to
- * previous page, if available.
- * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in
- * the parameter string will be replaced with the page number, so Page %
- * generates "Page 1", "Page 2", etc. Defaults to %, just the page number.
* 'before' - Default is '
Pages:' (string). The html or text to prepend to
* each bookmarks.
* 'after' - Default is '
' (string). The html or text to append to each
@@ -618,61 +617,76 @@ function post_password_required( $post = null ) {
* 'link_after' - Default is '' (string). The html or text to append to each
* Pages link inside the tag. Also appended to the current item, which
* is not linked.
+ * 'next_or_number' - Default is 'number' (string). Indicates whether page
+ * numbers should be used. Valid values are number and next.
+ * 'separator' - Default is ' ' (string). Text used between pagination links.
+ * 'nextpagelink' - Default is 'Next Page' (string). Text for link to next page.
+ * of the bookmark.
+ * 'previouspagelink' - Default is 'Previous Page' (string). Text for link to
+ * previous page, if available.
+ * 'pagelink' - Default is '%' (String).Format string for page numbers. The % in
+ * the parameter string will be replaced with the page number, so Page %
+ * generates "Page 1", "Page 2", etc. Defaults to %, just the page number.
+ * 'echo' - Default is 1 (integer). When not 0, this triggers the HTML to be
+ * echoed and then returned.
*
* @since 1.2.0
- * @access private
*
* @param string|array $args Optional. Overwrite the defaults.
* @return string Formatted output in HTML.
*/
-function wp_link_pages($args = '') {
+function wp_link_pages( $args = '' ) {
$defaults = array(
- 'before' => '' . __('Pages:'), 'after' => '
',
- 'link_before' => '', 'link_after' => '',
- 'next_or_number' => 'number', 'nextpagelink' => __('Next page'),
- 'previouspagelink' => __('Previous page'), 'pagelink' => '%',
- 'echo' => 1
+ 'before' => '' . __( 'Pages:' ),
+ 'after' => '
',
+ 'link_before' => '',
+ 'link_after' => '',
+ 'next_or_number' => 'number',
+ 'separator' => ' ',
+ 'nextpagelink' => __( 'Next page' ),
+ 'previouspagelink' => __( 'Previous page' ),
+ 'pagelink' => '%',
+ 'echo' => 1
);
$r = wp_parse_args( $args, $defaults );
$r = apply_filters( 'wp_link_pages_args', $r );
extract( $r, EXTR_SKIP );
- global $page, $numpages, $multipage, $more, $pagenow;
+ global $page, $numpages, $multipage, $more;
$output = '';
if ( $multipage ) {
if ( 'number' == $next_or_number ) {
$output .= $before;
- for ( $i = 1; $i < ($numpages+1); $i = $i + 1 ) {
- $j = str_replace('%',$i,$pagelink);
- $output .= ' ';
- if ( ($i != $page) || ((!$more) && ($page==1)) ) {
- $output .= _wp_link_page($i);
- }
- $output .= $link_before . $j . $link_after;
- if ( ($i != $page) || ((!$more) && ($page==1)) )
- $output .= ' ';
+ for ( $i = 1; $i <= $numpages; $i++ ) {
+ $link = $link_before . str_replace( '%', $i, $pagelink ) . $link_after;
+ if ( $i != $page || ! $more && 1 == $page )
+ $link = _wp_link_page( $i ) . $link . '';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
}
$output .= $after;
- } else {
- if ( $more ) {
- $output .= $before;
- $i = $page - 1;
- if ( $i && $more ) {
- $output .= _wp_link_page($i);
- $output .= $link_before. $previouspagelink . $link_after . '';
- }
- $i = $page + 1;
- if ( $i <= $numpages && $more ) {
- $output .= _wp_link_page($i);
- $output .= $link_before. $nextpagelink . $link_after . '';
- }
- $output .= $after;
+ } elseif ( $more ) {
+ $output .= $before;
+ $i = $page - 1;
+ if ( $i ) {
+ $link = _wp_link_page( $i ) . $link_before . $previouspagelink . $link_after . '';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
+ }
+ $i = $page + 1;
+ if ( $i <= $numpages ) {
+ $link = _wp_link_page( $i ) . $link_before . $nextpagelink . $link_after . '';
+ $link = apply_filters( 'wp_link_pages_link', $link, $i );
+ $output .= $separator . $link;
}
+ $output .= $after;
}
}
+ $output = apply_filters( 'wp_link_pages', $output, $args );
+
if ( $echo )
echo $output;
@@ -864,7 +878,7 @@ function wp_list_pages($args = '') {
*
*
* sort_column - How to sort the list of pages. Defaults
- * to page title. Use column for posts table.
+ * to 'menu_order, post_title'. Use column for posts table.
* menu_class - Class to use for the div ID which contains
* the page list. Defaults to 'menu'.
* echo - Whether to echo list or return it. Defaults to
@@ -899,7 +913,7 @@ function wp_page_menu( $args = array() ) {
$class = '';
if ( is_front_page() && !is_paged() )
$class = 'class="current_page_item"';
- $menu .= '' . $args['link_before'] . $text . $args['link_after'] . ' ';
+ $menu .= '' . $args['link_before'] . $text . $args['link_after'] . ' ';
// 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'] ) ) {
@@ -943,6 +957,11 @@ function walk_page_tree($pages, $depth, $current_page, $r) {
else
$walker = $r['walker'];
+ foreach ( (array) $pages as $page ) {
+ if ( $page->post_parent )
+ $r['pages_with_children'][ $page->post_parent ] = true;
+ }
+
$args = array($pages, $depth, $r, $current_page);
return call_user_func_array(array($walker, 'walk'), $args);
}
@@ -1023,7 +1042,7 @@ class Walker_Page extends Walker {
* @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
@@ -1031,6 +1050,10 @@ class Walker_Page extends Walker {
extract($args, EXTR_SKIP);
$css_class = array('page_item', 'page-item-'.$page->ID);
+
+ if( isset( $args['pages_with_children'][ $page->ID ] ) )
+ $css_class[] = 'page_item_has_children';
+
if ( !empty($current_page) ) {
$_current_page = get_post( $current_page );
if ( in_array( $page->ID, $_current_page->ancestors ) )
@@ -1045,6 +1068,10 @@ class Walker_Page extends Walker {
$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 );
+
+ /** This filter is documented in wp-includes/post-template.php */
$output .= $indent . '' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . ' ';
if ( !empty($show_date) ) {
@@ -1105,7 +1132,7 @@ class Walker_PageDropdown extends Walker {
* @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 .= "\tID\"";
@@ -1177,7 +1204,7 @@ function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = fals
if ( trim( $link_text ) == '' )
$link_text = $_post->post_title;
- return apply_filters( 'wp_get_attachment_link', "$link_text ", $id, $size, $permalink, $icon, $text );
+ return apply_filters( 'wp_get_attachment_link', "$link_text ", $id, $size, $permalink, $icon, $text );
}
/**
@@ -1213,18 +1240,17 @@ function prepend_attachment($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() {
- $post = get_post();
+function get_the_password_form( $post = 0 ) {
+ $post = get_post( $post );
$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
- $output = '
+ $output = '
';
- return apply_filters('the_password_form', $output);
+ return apply_filters( 'the_password_form', $output );
}
/**
@@ -1238,7 +1264,7 @@ function get_the_password_form() {
* @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() )
@@ -1263,13 +1289,13 @@ function is_page_template( $template = '' ) {
*
* @since 3.4.0
*
- * @param int $post_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 )
@@ -1300,9 +1326,9 @@ function wp_post_revision_title( $revision, $link = true ) {
/* 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 ) )
@@ -1316,145 +1342,122 @@ function wp_post_revision_title( $revision, $link = true ) {
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 = "$date ";
+
+ $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 ) )
- continue;
- if ( 'revision' === $type && wp_is_post_autosave( $revision ) )
+ if ( ! current_user_can( 'read_post', $revision->ID ) )
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 = 'ID|$revision->ID" ) . '">' . __( 'Restore' ) . ' ';
- else
- $actions = '';
-
- $rows .= "\n";
- $rows .= "\t \n";
- $rows .= "\t \n";
- $rows .= "\t$date \n";
- $rows .= "\t$name \n";
- $rows .= "\t$actions \n";
- $rows .= " \n";
- } else {
- $title = sprintf( $titlef, $date, $name );
- $rows .= "\t$title \n";
- }
+ $rows .= "\t" . wp_post_revision_title_expanded( $revision ) . " \n";
}
- if ( 'form-table' == $format ) : ?>
-
-
-
-\n";
- echo $rows;
- echo " ";
- endif;
+ echo "\n";
+ echo $rows;
+ echo " ";
+}
+/**
+ * Dashboard CSS fixes for 3.8.2.
+ *
+ * This function cheaply fixes #WP27082 and #WP26910 in lieu of
+ * changing the massive wp-admin.css file in a point release.
+ * This lucky includes file was already receiving an update.
+ *
+ * @since 3.8.2
+ * @access private
+ */
+function wp_382_css_hotfix() {
+ echo '
+';
}
+add_action( 'admin_print_styles', 'wp_382_css_hotfix', 30 );