<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15563] trunk/wp-includes: Adjustments to [15549].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15563">15563</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-09-04 15:51:04 +0000 (Sat, 04 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adjustments to <a href="http://trac.wordpress.org/changeset/15549">[15549]</a>. See <a href="http://trac.wordpress.org/ticket/11624">#11624</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (15562 => 15563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-09-04 12:25:44 UTC (rev 15562)
+++ trunk/wp-includes/comment-template.php 2010-09-04 15:51:04 UTC (rev 15563)
</span><span class="lines">@@ -545,11 +545,11 @@
</span><span class="cx"> * @return int The number of comments a post has
</span><span class="cx"> */
</span><span class="cx"> function get_comments_number( $post_id = 0 ) {
</span><ins>+ $post_id = absint( $post_id );
+
</ins><span class="cx"> if ( !$post_id )
</span><span class="cx"> $post_id = get_the_ID();
</span><span class="cx">
</span><del>- $post_id = absint($post_id);
-
</del><span class="cx"> $post = get_post($post_id);
</span><span class="cx"> if ( ! isset($post->comment_count) )
</span><span class="cx"> $count = 0;
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (15562 => 15563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-09-04 12:25:44 UTC (rev 15562)
+++ trunk/wp-includes/link-template.php 2010-09-04 15:51:04 UTC (rev 15563)
</span><span class="lines">@@ -461,13 +461,13 @@
</span><span class="cx"> * @param string $feed Optional. Feed type.
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><del>-function get_post_comments_feed_link($post_id = '', $feed = '') {
- if ( !$post_id )
</del><ins>+function get_post_comments_feed_link($post_id = 0, $feed = '') {
+ $post_id = absint( $post_id );
+
+ if ( ! $post_id )
</ins><span class="cx"> $post_id = get_the_ID();
</span><span class="cx">
</span><del>- $post_id = absint($post_id);
-
- if ( empty($feed) )
</del><ins>+ if ( empty( $feed ) )
</ins><span class="cx"> $feed = get_default_feed();
</span><span class="cx">
</span><span class="cx"> if ( '' != get_option('permalink_structure') ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15562 => 15563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-09-04 12:25:44 UTC (rev 15562)
+++ trunk/wp-includes/post.php 2010-09-04 15:51:04 UTC (rev 15563)
</span><span class="lines">@@ -1267,16 +1267,16 @@
</span><span class="cx"> * @param int $post_id post ID
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function get_post_custom($post_id = 0) {
- if ( !$post_id )
</del><ins>+function get_post_custom( $post_id = 0 ) {
+ $post_id = absint( $post_id );
+
+ if ( ! $post_id )
</ins><span class="cx"> $post_id = get_the_ID();
</span><span class="cx">
</span><del>- $post_id = (int) $post_id;
</del><ins>+ if ( ! wp_cache_get( $post_id, 'post_meta' ) )
+ update_postmeta_cache( $post_id );
</ins><span class="cx">
</span><del>- if ( ! wp_cache_get($post_id, 'post_meta') )
- update_postmeta_cache($post_id);
-
- return wp_cache_get($post_id, 'post_meta');
</del><ins>+ return wp_cache_get( $post_id, 'post_meta' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1333,18 +1333,18 @@
</span><span class="cx"> * @param int $post_id Optional. Post ID.
</span><span class="cx"> * @return bool Whether post is sticky.
</span><span class="cx"> */
</span><del>-function is_sticky($post_id = null) {
- if ( !$post_id )
</del><ins>+function is_sticky( $post_id = 0 ) {
+ $post_id = absint( $post_id );
+
+ if ( ! $post_id )
</ins><span class="cx"> $post_id = get_the_ID();
</span><span class="cx">
</span><del>- $post_id = absint($post_id);
</del><ins>+ $stickies = get_option( 'sticky_posts' );
</ins><span class="cx">
</span><del>- $stickies = get_option('sticky_posts');
-
- if ( !is_array($stickies) )
</del><ins>+ if ( ! is_array( $stickies ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( in_array($post_id, $stickies) )
</del><ins>+ if ( in_array( $post_id, $stickies ) )
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>