X-Git-Url: https://scripts.mit.edu/gitweb/autoinstallsdev/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..c55863f11e8589bf8d4a5698bf15752406654f1c:/wp-includes/post-template.php
diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php
index 2ff0e7db..522ad3e1 100644
--- a/wp-includes/post-template.php
+++ b/wp-includes/post-template.php
@@ -12,24 +12,21 @@
* 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;
+ return get_post()->ID;
}
/**
@@ -63,7 +60,7 @@ function the_title($before = '', $after = '', $echo = true) {
* an array. See the function for what can be override in the $args parameter.
*
* The title before it is displayed will have the tags stripped and {@link
- * attribute_escape()} before it is passed to the user or displayed. The default
+ * esc_attr()} before it is passed to the user or displayed. The default
* as with {@link the_title()}, is to display the title.
*
* @since 2.3.0
@@ -72,18 +69,17 @@ 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();
-
- if ( strlen($title) == 0 )
- return;
-
- $defaults = array('before' => '', 'after' => '', 'echo' => true);
+ $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;
$title = $before . $title . $after;
- $title = attribute_escape(strip_tags($title));
+ $title = esc_attr(strip_tags($title));
if ( $echo )
echo $title;
@@ -100,21 +96,26 @@ function the_title_attribute( $args = '' ) {
*
* @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 = $post->post_title;
-
- if ( !is_admin() ) {
- if ( !empty($post->post_password) )
- $title = sprintf(__('Protected: %s'), $title);
- else if ( isset($post->post_status) && 'private' == $post->post_status )
- $title = sprintf(__('Private: %s'), $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 );
+
+ return apply_filters( 'the_title', $title, $id );
}
/**
@@ -124,12 +125,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 ) );
}
/**
@@ -145,7 +148,7 @@ function the_guid( $id = 0 ) {
* @return string
*/
function get_the_guid( $id = 0 ) {
- $post = &get_post($id);
+ $post = get_post($id);
return apply_filters('get_the_guid', $post->guid);
}
@@ -156,13 +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 string $stripteaser Optional. Teaser content before the more text.
- * @param string $more_file Optional. Not used.
+ * @param bool $strip_teaser Optional. Strip teaser content before the more text. Default is false.
*/
-function the_content($more_link_text = null, $stripteaser = 0, $more_file = '') {
- $content = get_the_content($more_link_text, $stripteaser, $more_file);
- $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;
}
@@ -172,62 +174,76 @@ function the_content($more_link_text = null, $stripteaser = 0, $more_file = '')
* @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 string $more_file Optional. Not used.
+ * @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, $more_file = '') {
- global $id, $post, $more, $page, $pages, $multipage, $preview, $pagenow;
+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 = '';
+ $has_teaser = 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( $post );
- if ( $more_file != '' )
- $file = $more_file;
- else
- $file = $pagenow; //$_SERVER['PHP_SELF'];
+ 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])));
+ $has_teaser = true;
} else {
- $content = array($content);
+ $content = array( $content );
}
- if ( (false !== strpos($post->post_content, '') && ((!$multipage) || ($page==1))) )
- $stripteaser = 1;
+
+ if ( false !== strpos( $post->post_content, '' ) && ( ! $multipage || $page == 1 ) )
+ $strip_teaser = true;
+
$teaser = $content[0];
- if ( ($more) && ($stripteaser) )
+
+ if ( $more && $strip_teaser && $has_teaser )
$teaser = '';
+
$output .= $teaser;
- if ( count($content) > 1 ) {
+
+ if ( count( $content ) > 1 ) {
if ( $more ) {
- $output .= ''.$content[1];
+ $output .= '' . $content[1];
} else {
- $output = balanceTags($output);
- if ( ! empty($more_link_text) )
- $output .= ' $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 );
}
-
}
+
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
+ * @return string
+ */
+function _convert_urlencoded_to_entities( $match ) {
+ return '' . base_convert( $match[1], 16, 10 ) . ';';
+}
+
/**
* Display the post excerpt.
*
@@ -246,16 +262,17 @@ function the_excerpt() {
* @param mixed $deprecated Not used.
* @return string
*/
-function get_the_excerpt($deprecated = '') {
- global $post;
- $output = '';
- $output = $post->post_excerpt;
- if ( post_password_required($post) ) {
- $output = __('There is no excerpt because this is a protected post.');
- return $output;
+function get_the_excerpt( $deprecated = '' ) {
+ if ( !empty( $deprecated ) )
+ _deprecated_argument( __FUNCTION__, '2.3' );
+
+ $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 );
}
/**
@@ -267,7 +284,7 @@ function get_the_excerpt($deprecated = '') {
* @return bool
*/
function has_excerpt( $id = 0 ) {
- $post = &get_post( $id );
+ $post = get_post( $id );
return ( !empty( $post->post_excerpt ) );
}
@@ -306,27 +323,52 @@ function get_post_class( $class = '', $post_id = null ) {
$classes = array();
- $classes[] = $post->post_type;
+ if ( empty($post) )
+ return $classes;
+
+ $classes[] = 'post-' . $post->ID;
+ if ( ! is_admin() )
+ $classes[] = $post->post_type;
+ $classes[] = 'type-' . $post->post_type;
+ $classes[] = 'status-' . $post->post_status;
+
+ // Post Format
+ if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
+ $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-' . $cat->slug;
+ 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-' . $tag->slug;
+ 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) ) {
@@ -335,44 +377,220 @@ function get_post_class( $class = '', $post_id = null ) {
$classes = array_merge($classes, $class);
}
- return apply_filters('post_class', $classes, $class, $post_id);
+ $classes = array_map('esc_attr', $classes);
+
+ return apply_filters('post_class', $classes, $class, $post->ID);
}
/**
- * Whether post requires password and correct password has been provided.
+ * Display the classes for the body element.
*
- * @since 2.7.0
+ * @since 2.8.0
*
- * @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.
+ * @param string|array $class One or more classes to add to the class list.
*/
-function post_password_required( $post = null ) {
- $post = get_post($post);
+function body_class( $class = '' ) {
+ // Separates classes with a single space, collates classes for body element
+ echo 'class="' . join( ' ', get_body_class( $class ) ) . '"';
+}
- if ( empty($post->post_password) )
- return false;
+/**
+ * Retrieve the classes for the body element as an array.
+ *
+ * @since 2.8.0
+ *
+ * @param string|array $class One or more classes to add to the class list.
+ * @return array Array of classes.
+ */
+function get_body_class( $class = '' ) {
+ global $wp_query, $wpdb;
- if ( !isset($_COOKIE['wp-postpass_' . COOKIEHASH]) )
- return true;
+ $classes = array();
- if ( $_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password )
- return true;
+ if ( is_rtl() )
+ $classes[] = 'rtl';
+
+ if ( is_front_page() )
+ $classes[] = 'home';
+ if ( is_home() )
+ $classes[] = 'blog';
+ if ( is_archive() )
+ $classes[] = 'archive';
+ if ( is_date() )
+ $classes[] = 'date';
+ if ( is_search() ) {
+ $classes[] = 'search';
+ $classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
+ }
+ if ( is_paged() )
+ $classes[] = 'paged';
+ if ( is_attachment() )
+ $classes[] = 'attachment';
+ if ( is_404() )
+ $classes[] = 'error404';
+
+ if ( is_single() ) {
+ $post_id = $wp_query->get_queried_object_id();
+ $post = $wp_query->get_queried_object();
+
+ $classes[] = 'single';
+ 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';
+ }
+ }
- return false;
+ if ( is_attachment() ) {
+ $mime_type = get_post_mime_type($post_id);
+ $mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
+ $classes[] = 'attachmentid-' . $post_id;
+ $classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
+ }
+ } elseif ( is_archive() ) {
+ if ( is_post_type_archive() ) {
+ $classes[] = 'post-type-archive';
+ $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';
+ 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';
+ 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';
+ 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();
+ 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_post($page_id);
+
+ $classes[] = 'page-id-' . $page_id;
+
+ if ( $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status = 'publish' LIMIT 1", $page_id) ) )
+ $classes[] = 'page-parent';
+
+ if ( $post->post_parent ) {
+ $classes[] = 'page-child';
+ $classes[] = 'parent-pageid-' . $post->post_parent;
+ }
+ if ( is_page_template() ) {
+ $classes[] = 'page-template';
+ $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_page_template_slug( $page_id ) ) );
+ } else {
+ $classes[] = 'page-template-default';
+ }
+ }
+
+ if ( is_user_logged_in() )
+ $classes[] = 'logged-in';
+
+ if ( is_admin_bar_showing() ) {
+ $classes[] = 'admin-bar';
+ $classes[] = 'no-customize-support';
+ }
+
+ if ( get_theme_mod( 'background_color' ) || get_background_image() )
+ $classes[] = 'custom-background';
+
+ $page = $wp_query->get( 'page' );
+
+ if ( !$page || $page < 2)
+ $page = $wp_query->get( 'paged' );
+
+ if ( $page && $page > 1 ) {
+ $classes[] = 'paged-' . $page;
+
+ if ( is_single() )
+ $classes[] = 'single-paged-' . $page;
+ elseif ( is_page() )
+ $classes[] = 'page-paged-' . $page;
+ elseif ( is_category() )
+ $classes[] = 'category-paged-' . $page;
+ elseif ( is_tag() )
+ $classes[] = 'tag-paged-' . $page;
+ elseif ( is_date() )
+ $classes[] = 'date-paged-' . $page;
+ elseif ( is_author() )
+ $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 ( !is_array( $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 );
+
+ return apply_filters( 'body_class', $classes, $class );
}
/**
- * Display "sticky" CSS class, if a post is sticky.
+ * Whether post requires password and correct password has been provided.
*
* @since 2.7.0
*
- * @param int $post_id An optional post ID.
+ * @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 sticky_class( $post_id = null ) {
- if ( !is_sticky($post_id) )
- return;
+function post_password_required( $post = null ) {
+ $post = get_post($post);
+
+ if ( empty( $post->post_password ) )
+ return false;
+
+ if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
+ return true;
+
+ require_once ABSPATH . 'wp-includes/class-phpass.php';
+ $hasher = new PasswordHash( 8, true );
+
+ $hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
+ if ( 0 !== strpos( $hash, '$P$B' ) )
+ return true;
- echo " sticky";
+ return ! $hasher->CheckPassword( $post->post_password, $hash );
}
/**
@@ -389,8 +607,19 @@ function sticky_class( $post_id = null ) {
* Quicktag one or more times). This tag must be within The Loop.
*
* The defaults for overwriting are:
+ * '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
+ * bookmarks.
+ * 'link_before' - Default is '' (string). The html or text to prepend to each
+ * Pages link inside the 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 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
@@ -398,102 +627,98 @@ function sticky_class( $post_id = null ) {
* '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
- * bookmarks.
- * 'more_file' - Default is '' (string) Page the links should point to. Defaults
- * to the current page.
- * 'link_before' - Default is '' (string). The html or text to prepend to each
- * Pages link inside the tag.
- * 'link_after' - Default is '' (string). The html or text to append to each
- * Pages link inside the tag.
+ * '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' => '%',
- 'more_file' => '', '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 $post, $page, $numpages, $multipage, $more, $pagenow;
- if ( $more_file != '' )
- $file = $more_file;
- else
- $file = $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)) ) {
- if ( 1 == $i ) {
- $output .= '';
- } else {
- if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
- $output .= '';
- else
- $output .= '';
- }
-
- }
- $output .= $link_before;
- $output .= $j;
- $output .= $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 ) {
- if ( 1 == $i ) {
- $output .= '' . $link_before. $previouspagelink . $link_after . '';
- } else {
- if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
- $output .= '' . $link_before. $previouspagelink . $link_after . '';
- else
- $output .= '' . $link_before. $previouspagelink . $link_after . '';
- }
- }
- $i = $page + 1;
- if ( $i <= $numpages && $more ) {
- if ( 1 == $i ) {
- $output .= '' . $link_before. $nextpagelink . $link_after . '';
- } else {
- if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
- $output .= '' . $link_before. $nextpagelink . $link_after . '';
- else
- $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;
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 $wp_rewrite;
+ $post = get_post();
+
+ if ( 1 == $i ) {
+ $url = get_permalink();
+ } else {
+ if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
+ $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 '';
+}
//
// Post-meta: Custom per-post fields.
@@ -505,12 +730,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];
@@ -528,7 +755,7 @@ function the_meta() {
echo "\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,', ');
@@ -554,7 +781,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' => ''
);
@@ -563,13 +791,16 @@ function wp_dropdown_pages($args = '') {
$pages = get_pages($r);
$output = '';
+ // Back-compat with old system where both id and name were based on $name argument
+ if ( empty($id) )
+ $id = $name;
if ( ! empty($pages) ) {
- $output = "
";
- endif;
+ echo "" . __( 'JavaScript must be enabled to use this feature.' ) . "
\n";
+ echo "\n";
+ echo $rows;
+ echo "
";
}