<!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>[56843] branches/6.3/src/wp-admin/includes: Comments: Prevent users who can not see a post from seeing comments on it.</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/56843">56843</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/56843","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-10-12 13:22:17 +0000 (Thu, 12 Oct 2023)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Comments: Prevent users who can not see a post from seeing comments on it.

Props peterwilsoncc, jorbin, audrasjb.
Merges <a href="https://core.trac.wordpress.org/changeset/56836">[56836]</a> to the 6.3 branch.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches63srcwpadminincludesclasswpcommentslisttablephp">branches/6.3/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#branches63srcwpadminincludesclasswplisttablephp">branches/6.3/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#branches63srcwpadminincludesdashboardphp">branches/6.3/src/wp-admin/includes/dashboard.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branches63">branches/6.3/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.3
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.3 2023-10-12 13:20:35 UTC (rev 56842)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.3  2023-10-12 13:22:17 UTC (rev 56843)
</ins><a id="branches63"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.3</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56459,56461,56463,56490-56491,56502-56503,56524-56525,56527,56529,56550,56577,56622,56757,56778,56783,56785,56833-56835
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:56268,56272,56277,56279,56282,56284,56287,56290-56292,56296,56298,56300,56302,56308-56309,56311,56315,56320,56327,56329,56332,56335,56337,56339,56341,56350,56358,56365,56381,56386,56401,56417,56422,56459,56461,56463,56490-56491,56502-56503,56524-56525,56527,56529,56550,56577,56622,56757,56778,56783,56785,56833-56836
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches63srcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-admin/includes/class-wp-comments-list-table.php       2023-10-12 13:20:35 UTC (rev 56842)
+++ branches/6.3/src/wp-admin/includes/class-wp-comments-list-table.php 2023-10-12 13:22:17 UTC (rev 56843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,6 +651,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $edit_post_cap = $post ? 'edit_post' : 'edit_posts';
+               if (
+                       current_user_can( $edit_post_cap, $comment->comment_post_ID ) ||
+                       (
+                               empty( $post->post_password ) &&
+                               current_user_can( 'read_post', $comment->comment_post_ID )
+                       )
+               ) {
+                       // The user has access to the post
+               } else {
+                       return false;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class'>";
</span><span class="cx" style="display: block; padding: 0 10px">                $this->single_row_columns( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">                echo "</tr>\n";
</span></span></pre></div>
<a id="branches63srcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-admin/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-admin/includes/class-wp-list-table.php        2023-10-12 13:20:35 UTC (rev 56842)
+++ branches/6.3/src/wp-admin/includes/class-wp-list-table.php  2023-10-12 13:22:17 UTC (rev 56843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,6 +818,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $pending_comments_number
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $post_object   = get_post( $post_id );
+               $edit_post_cap = $post_object ? 'edit_post' : 'edit_posts';
+               if (
+                       current_user_can( $edit_post_cap, $post_id ) ||
+                       (
+                               empty( $post_object->post_password ) &&
+                               current_user_can( 'read_post', $post_id )
+                       )
+               ) {
+                       // The user has access to the post and thus can see comments
+               } else {
+                       return false;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( ! $approved_comments && ! $pending_comments ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        // No comments at all.
</span><span class="cx" style="display: block; padding: 0 10px">                        printf(
</span></span></pre></div>
<a id="branches63srcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.3/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.3/src/wp-admin/includes/dashboard.php  2023-10-12 13:20:35 UTC (rev 56842)
+++ branches/6.3/src/wp-admin/includes/dashboard.php    2023-10-12 13:22:17 UTC (rev 56843)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1103,7 +1103,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
</span><span class="cx" style="display: block; padding: 0 10px">                foreach ( $comments as $comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        _wp_dashboard_recent_comments_row( $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $comment_post = get_post( $comment->comment_post_ID );
+                       if (
+                               current_user_can( 'edit_post', $comment->comment_post_ID ) ||
+                               (
+                                       empty( $comment_post->post_password ) &&
+                                       current_user_can( 'read_post', $comment->comment_post_ID )
+                               )
+                       ) {
+                               _wp_dashboard_recent_comments_row( $comment );
+                       }
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px">                echo '</ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>