X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..baca9ce86a38dc54c4574890ee2d352fd81f78b2:/wp-includes/post-template.php?ds=sidebyside diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index e8607166..d51d0095 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; } /** @@ -81,7 +78,6 @@ function the_title_attribute( $args = '' ) { $r = wp_parse_args($args, $defaults); extract( $r, EXTR_SKIP ); - $title = $before . $title . $after; $title = esc_attr(strip_tags($title)); @@ -100,24 +96,25 @@ function the_title_attribute( $args = '' ) { * * @since 0.71 * - * @param int $id Optional. Post ID. + * @param mixed $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 ); } @@ -151,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); } @@ -162,9 +159,9 @@ 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 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); @@ -177,11 +174,13 @@ function the_content($more_link_text = null, $stripteaser = 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 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; +function get_the_content( $more_link_text = null, $stripteaser = false ) { + global $more, $page, $pages, $multipage, $preview; + + $post = get_post(); if ( null === $more_link_text ) $more_link_text = __( '(more...)' ); @@ -190,10 +189,8 @@ function get_the_content($more_link_text = null, $stripteaser = 0) { $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() ) + 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 @@ -209,27 +206,39 @@ function get_the_content($more_link_text = null, $stripteaser = 0) { $content = array($content); } if ( (false !== strpos($post->post_content, '') && ((!$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 .= '' . $content[1]; + $output .= '' . $content[1]; } else { if ( ! empty($more_link_text) ) - $output .= apply_filters( 'the_content_more_link', ' $more_link_text", $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. * @@ -252,14 +261,13 @@ function get_the_excerpt( $deprecated = '' ) { 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 ); } /** @@ -271,7 +279,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 ) ); } @@ -314,28 +322,48 @@ function get_post_class( $class = '', $post_id = null ) { 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 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() && !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) ) { @@ -385,8 +413,10 @@ function get_body_class( $class = '' ) { $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() ) @@ -399,8 +429,20 @@ function get_body_class( $class = '' ) { $post = $wp_query->get_queried_object(); $classes[] = 'single'; - $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id); - $classes[] = 'postid-' . $post_id; + 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() ) { $mime_type = get_post_mime_type($post_id); @@ -409,25 +451,44 @@ function get_body_class( $class = '' ) { $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 ); + 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->cat_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 ); + 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_page($page_id); + $post = get_post($page_id); $classes[] = 'page-id-' . $page_id; @@ -440,18 +501,23 @@ function get_body_class( $class = '' ) { } if ( is_page_template() ) { $classes[] = 'page-template'; - $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_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'; + 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) @@ -474,12 +540,17 @@ function get_body_class( $class = '' ) { $classes[] = 'author-paged-' . $page; elseif ( is_search() ) $classes[] = 'search-paged-' . $page; + elseif ( is_post_type_archive() ) + $classes[] = 'post-type-paged-' . $page; } - if ( !empty( $class ) ) { + if ( ! empty( $class ) ) { if ( !is_array( $class ) ) $class = preg_split( '#\s+#', $class ); $classes = array_merge( $classes, $class ); + } else { + // Ensure that we always coerce class to being an array. + $class = array(); } $classes = array_map( 'esc_attr', $classes ); @@ -492,36 +563,26 @@ function get_body_class( $class = '' ) { * * @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 ) { $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; + require_once ABSPATH . 'wp-includes/class-phpass.php'; + $hasher = new PasswordHash( 8, true ); - return false; -} - -/** - * 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 = stripslashes( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] ); + if ( 0 !== strpos( $hash, '$P$B' ) ) + return true; - echo " sticky"; + return ! $hasher->CheckPassword( $post->post_password, $hash ); } /** @@ -577,7 +638,7 @@ function wp_link_pages($args = '') { $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 ) { @@ -587,21 +648,9 @@ function wp_link_pages($args = '') { $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 .= ''; - elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) - $output .= ''; - else - $output .= ''; - } - + $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 .= ''; } @@ -611,30 +660,12 @@ function wp_link_pages($args = '') { $output .= $before; $i = $page - 1; if ( $i && $more ) { - if ( 1 == $i ) { - $output .= ''; - } else { - if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) - $output .= ''; - elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) - $output .= ''; - else - $output .= ''; - } + $output .= _wp_link_page($i); $output .= $link_before. $previouspagelink . $link_after . ''; } $i = $page + 1; if ( $i <= $numpages && $more ) { - if ( 1 == $i ) { - $output .= ''; - } else { - if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) - $output .= ''; - elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) - $output .= ''; - else - $output .= ''; - } + $output .= _wp_link_page($i); $output .= $link_before. $nextpagelink . $link_after . ''; } $output .= $after; @@ -648,6 +679,32 @@ function wp_link_pages($args = '') { return $output; } +/** + * Helper function for wp_link_pages(). + * + * @since 3.1.0 + * @access private + * + * @param int $i Page number. + * @return string Link. + */ +function _wp_link_page( $i ) { + global $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. @@ -684,7 +741,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,', '); @@ -720,13 +777,12 @@ function wp_dropdown_pages($args = '') { $pages = get_pages($r); $output = ''; - $name = esc_attr($name); // Back-compat with old system where both id and name were based on $name argument if ( empty($id) ) $id = $name; if ( ! empty($pages) ) { - $output = "\n"; + $output = "\n"; if ( $show_option_no_change ) $output .= "\t$show_option_no_change"; if ( $show_option_none ) @@ -823,6 +879,7 @@ function wp_list_pages($args = '') { * @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' => ''); @@ -887,7 +944,7 @@ function walk_page_tree($pages, $depth, $current_page, $r) { $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); } /** @@ -904,7 +961,161 @@ function walk_page_dropdown_tree() { else $walker = $args[2]['walker']; - return call_user_func_array(array(&$walker, 'walk'), $args); + 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. + * @param array $args + */ + function start_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "\n$indent\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. + * @param array $args + */ + function end_lvl( &$output, $depth = 0, $args = array() ) { + $indent = str_repeat("\t", $depth); + $output .= "$indent\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_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'; + 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 . '' . $link_before . apply_filters( 'the_title', $page->post_title, $page->ID ) . $link_after . ''; + + 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. + * @param array $args + */ + function end_el( &$output, $page, $depth = 0, $args = array() ) { + $output .= "\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. + * @param int $id + */ + function start_el(&$output, $page, $depth, $args, $id = 0) { + $pad = str_repeat(' ', $depth * 3); + + $output .= "\tID\""; + if ( $page->ID == $args['selected'] ) + $output .= ' selected="selected"'; + $output .= '>'; + $title = apply_filters( 'list_pages', $page->post_title, $page ); + $output .= $pad . esc_html( $title ); + $output .= "\n"; + } } // @@ -941,30 +1152,29 @@ function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $ * @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 ); +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); - } else { + 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', "$link_text", $id, $size, $permalink, $icon, $text ); @@ -980,7 +1190,7 @@ function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false * @return string */ function prepend_attachment($content) { - global $post; + $post = get_post(); if ( empty($post->post_type) || $post->post_type != 'attachment' ) return $content; @@ -1007,12 +1217,12 @@ function prepend_attachment($content) { * @return string HTML content for password form for password protected post. */ function get_the_password_form() { - global $post; - $label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID); - $output = ' + $post = get_post(); + $label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID ); + $output = ' ' . __("This post is password protected. To view it please enter your password below:") . ' ' . __("Password:") . ' - + '; return apply_filters('the_password_form', $output); } @@ -1030,29 +1240,43 @@ function get_the_password_form() { * @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 $post_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). * @@ -1100,7 +1324,7 @@ function wp_post_revision_title( $revision, $link = true ) { * * 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. @@ -1149,7 +1373,7 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { 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 ) { @@ -1210,9 +1434,9 @@ function wp_list_post_revisions( $post_id = 0, $args = null ) { - - - + + +
' . __("This post is password protected. To view it please enter your password below:") . '
' . __("Password:") . '