<!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" />
<title>[19252] trunk/wp-admin/includes/class-wp-media-list-table.php: Check caps when showing media edit and attach links.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19252">19252</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-11-11 15:04:54 +0000 (Fri, 11 Nov 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Check caps when showing media edit and attach links.  Clean up formatting. Props kurtpayne, DH-Shredder, solarissmoke. fixes <a href="http://core.trac.wordpress.org/ticket/17419">#17419</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (19251 => 19252)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php        2011-11-11 14:10:54 UTC (rev 19251)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php        2011-11-11 15:04:54 UTC (rev 19252)
</span><span class="lines">@@ -164,6 +164,7 @@
</span><span class="cx">                 $alt = '';
</span><span class="cx"> 
</span><span class="cx">                 while ( have_posts() ) : the_post();
</span><ins>+                        $user_can_edit = current_user_can( 'edit_post', $post-&gt;ID );
</ins><span class="cx"> 
</span><span class="cx">                         if ( $this-&gt;is_trash &amp;&amp; $post-&gt;post_status != 'trash'
</span><span class="cx">                         ||  !$this-&gt;is_trash &amp;&amp; $post-&gt;post_status == 'trash' )
</span><span class="lines">@@ -190,7 +191,11 @@
</span><span class="cx"> 
</span><span class="cx">         case 'cb':
</span><span class="cx"> ?&gt;
</span><del>-                &lt;th scope=&quot;row&quot; class=&quot;check-column&quot;&gt;&lt;?php if ( current_user_can( 'edit_post', $post-&gt;ID ) ) { ?&gt;&lt;input type=&quot;checkbox&quot; name=&quot;media[]&quot; value=&quot;&lt;?php the_ID(); ?&gt;&quot; /&gt;&lt;?php } ?&gt;&lt;/th&gt;
</del><ins>+                &lt;th scope=&quot;row&quot; class=&quot;check-column&quot;&gt;
+                        &lt;?php if ( $user_can_edit ) { ?&gt;
+                                &lt;input type=&quot;checkbox&quot; name=&quot;media[]&quot; value=&quot;&lt;?php the_ID(); ?&gt;&quot; /&gt;
+                        &lt;?php } ?&gt;
+                &lt;/th&gt;
</ins><span class="cx"> &lt;?php
</span><span class="cx">                 break;
</span><span class="cx"> 
</span><span class="lines">@@ -199,7 +204,7 @@
</span><span class="cx"> ?&gt;
</span><span class="cx">                 &lt;td &lt;?php echo $attributes ?&gt;&gt;&lt;?php
</span><span class="cx">                         if ( $thumb = wp_get_attachment_image( $post-&gt;ID, array( 80, 60 ), true ) ) {
</span><del>-                                if ( $this-&gt;is_trash ) {
</del><ins>+                                if ( $this-&gt;is_trash || ! $user_can_edit ) {
</ins><span class="cx">                                         echo $thumb;
</span><span class="cx">                                 } else {
</span><span class="cx"> ?&gt;
</span><span class="lines">@@ -216,7 +221,15 @@
</span><span class="cx"> 
</span><span class="cx">         case 'title':
</span><span class="cx"> ?&gt;
</span><del>-                &lt;td &lt;?php echo $attributes ?&gt;&gt;&lt;strong&gt;&lt;?php if ( $this-&gt;is_trash ) echo $att_title; else { ?&gt;&lt;a href=&quot;&lt;?php echo get_edit_post_link( $post-&gt;ID, true ); ?&gt;&quot; title=&quot;&lt;?php echo esc_attr( sprintf( __( 'Edit &amp;#8220;%s&amp;#8221;' ), $att_title ) ); ?&gt;&quot;&gt;&lt;?php echo $att_title; ?&gt;&lt;/a&gt;&lt;?php }; _media_states( $post ); ?&gt;&lt;/strong&gt;
</del><ins>+                &lt;td &lt;?php echo $attributes ?&gt;&gt;&lt;strong&gt;
+                        &lt;?php if ( $this-&gt;is_trash || ! $user_can_edit ) {
+                                echo $att_title;
+                        } else { ?&gt;
+                        &lt;a href=&quot;&lt;?php echo get_edit_post_link( $post-&gt;ID, true ); ?&gt;&quot;
+                                title=&quot;&lt;?php echo esc_attr( sprintf( __( 'Edit &amp;#8220;%s&amp;#8221;' ), $att_title ) ); ?&gt;&quot;&gt;
+                                &lt;?php echo $att_title; ?&gt;&lt;/a&gt;
+                        &lt;?php };
+                        _media_states( $post ); ?&gt;&lt;/strong&gt;
</ins><span class="cx">                         &lt;p&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx">                         if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post-&gt;ID ), $matches ) )
</span><span class="lines">@@ -288,15 +301,25 @@
</span><span class="cx">                                 $title =_draft_or_post_title( $post-&gt;post_parent );
</span><span class="cx">                         }
</span><span class="cx"> ?&gt;
</span><del>-                        &lt;td &lt;?php echo $attributes ?&gt;&gt;
-                                &lt;strong&gt;&lt;a href=&quot;&lt;?php echo get_edit_post_link( $post-&gt;post_parent ); ?&gt;&quot;&gt;&lt;?php echo $title ?&gt;&lt;/a&gt;&lt;/strong&gt;,
</del><ins>+                        &lt;td &lt;?php echo $attributes ?&gt;&gt;&lt;strong&gt;
+                                &lt;?php if( current_user_can( 'edit_post', $post-&gt;post_parent ) ) { ?&gt;
+                                        &lt;a href=&quot;&lt;?php echo get_edit_post_link( $post-&gt;post_parent ); ?&gt;&quot;&gt;
+                                                &lt;?php echo $title ?&gt;&lt;/a&gt;
+                                &lt;?php } else { 
+                                        echo $title; 
+                                } ?&gt;&lt;/strong&gt;,
</ins><span class="cx">                                 &lt;?php echo get_the_time( __( 'Y/m/d' ) ); ?&gt;
</span><span class="cx">                         &lt;/td&gt;
</span><span class="cx"> &lt;?php
</span><span class="cx">                 } else {
</span><span class="cx"> ?&gt;
</span><span class="cx">                         &lt;td &lt;?php echo $attributes ?&gt;&gt;&lt;?php _e( '(Unattached)' ); ?&gt;&lt;br /&gt;
</span><del>-                        &lt;a class=&quot;hide-if-no-js&quot; onclick=&quot;findPosts.open( 'media[]','&lt;?php echo $post-&gt;ID ?&gt;' );return false;&quot; href=&quot;#the-list&quot;&gt;&lt;?php _e( 'Attach' ); ?&gt;&lt;/a&gt;&lt;/td&gt;
</del><ins>+                        &lt;?php if( $user_can_edit ) {?&gt;
+                                &lt;a class=&quot;hide-if-no-js&quot;
+                                        onclick=&quot;findPosts.open( 'media[]','&lt;?php echo $post-&gt;ID ?&gt;' ); return false;&quot;
+                                        href=&quot;#the-list&quot;&gt;
+                                        &lt;?php _e( 'Attach' ); ?&gt;&lt;/a&gt;
+                        &lt;?php } ?&gt;&lt;/td&gt;
</ins><span class="cx"> &lt;?php
</span><span class="cx">                 }
</span><span class="cx">                 break;
</span></span></pre>
</div>
</div>

</body>
</html>