<!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>[16315] trunk: Add checks for WP_Error.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16315">16315</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-11-12 04:10:56 +0000 (Fri, 12 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add checks for WP_Error. props ptahdunbar. see <a href="http://trac.wordpress.org/ticket/14746">#14746</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (16314 => 16315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-11-12 04:05:33 UTC (rev 16314)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-11-12 04:10:56 UTC (rev 16315)
</span><span class="lines">@@ -468,8 +468,10 @@
</span><span class="cx"> $title = _draft_or_post_title();
</span><span class="cx"> $post_type_object = get_post_type_object( $post->post_type );
</span><span class="cx"> $can_edit_post = current_user_can( 'edit_post', $post->ID );
</span><ins>+ $post_format = get_post_format( $post->ID );
+ $post_format_class = ( $post_format && !is_wp_error($post_format) ) ? 'format-' . sanitize_html_class( $post_format ) : 'format-default';
</ins><span class="cx"> ?>
</span><del>- <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status . ' ' . sanitize_html_class( 'format-' . ( get_post_format( $post->ID ) ? get_post_format( $post->ID ) : 'default' ) ) ); ?> iedit' valign="top">
</del><ins>+ <tr id='post-<?php echo $post->ID; ?>' class='<?php echo trim( $rowclass . ' author-' . $post_owner . ' status-' . $post->post_status . ' ' . $post_format_class); ?> iedit' valign="top">
</ins><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> list( $columns, $hidden ) = $this->get_column_info();
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (16314 => 16315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-11-12 04:05:33 UTC (rev 16314)
+++ trunk/wp-includes/post-template.php 2010-11-12 04:10:56 UTC (rev 16315)
</span><span class="lines">@@ -327,8 +327,12 @@
</span><span class="cx"> $classes[] = $post->post_type;
</span><span class="cx"> $classes[] = 'type-' . $post->post_type;
</span><span class="cx"> $classes[] = 'status-' . $post->post_status;
</span><del>- if ( get_post_format( $post->ID ) )
- $classes[] = 'format-' . sanitize_html_class( get_post_format( $post->ID ) );
</del><ins>+
+ // Post Format
+ $post_format = get_post_format( $post->ID );
+
+ if ( $post_format && !is_wp_error($post_format) )
+ $classes[] = 'format-' . sanitize_html_class( $post_format );
</ins><span class="cx"> else
</span><span class="cx"> $classes[] = 'format-default';
</span><span class="cx">
</span><span class="lines">@@ -424,8 +428,12 @@
</span><span class="cx"> $classes[] = 'single';
</span><span class="cx"> $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
</span><span class="cx"> $classes[] = 'postid-' . $post_id;
</span><del>- if ( get_post_format( $post_id ) )
- $classes[] = 'single-format-' . sanitize_html_class( get_post_format( $post_id ) );
</del><ins>+
+ // Post Format
+ $post_format = get_post_format( $post->ID );
+
+ if ( $post_format && !is_wp_error($post_format) )
+ $classes[] = 'single-format-' . sanitize_html_class( $post_format );
</ins><span class="cx"> else
</span><span class="cx"> $classes[] = 'single-format-default';
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>