<!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>[12071] sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussions-dashboard.php: gp-translation-helpers: Fix notices</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="http://meta.trac.wordpress.org/changeset/12071">12071</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/12071","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>akirk</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-09-16 10:15:08 +0000 (Fri, 16 Sep 2022)</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'>gp-translation-helpers: Fix notices</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationdiscussionphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesdiscussionsdashboardphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussions-dashboard.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpers">sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers 2022-09-16 09:58:55 UTC (rev 12070)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers 2022-09-16 10:15:08 UTC (rev 12071)
</ins><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpers"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:ignore</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> phpcs.xml.dist
</span><span class="cx" style="display: block; padding: 0 10px"> .eslintrc.json
</span><span class="cx" style="display: block; padding: 0 10px"> tmp
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+phpunit.xml.dist
+tests
</ins><a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelpershelpershelpertranslationdiscussionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php 2022-09-16 09:58:55 UTC (rev 12070)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/helpers/helper-translation-discussion.php 2022-09-16 10:15:08 UTC (rev 12071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -558,6 +558,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post' => $post,
</span><span class="cx" style="display: block; padding: 0 10px"> 'translation_id' => isset( $this->data['translation_id'] ) ? $this->data['translation_id'] : null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'locale_slug' => $this->data['locale_slug'],
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'original_permalink' => $this->data['original_permalink'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'original_id' => $this->data['original_id'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'project' => $this->data['project'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'translation_set_slug' => $this->data['translation_set_slug'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -671,7 +672,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $link The link.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args The arguments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $comment The comment.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param object $comment The comment.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post The post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Return the reply link HTML.
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsgptranslationhelperstemplatesdiscussionsdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussions-dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussions-dashboard.php 2022-09-16 09:58:55 UTC (rev 12070)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/gp-translation-helpers/templates/discussions-dashboard.php 2022-09-16 10:15:08 UTC (rev 12071)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_by_post_id[ $_comment->comment_post_ID ] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> $comments_by_post_id[ $_comment->comment_post_ID ][] = $_comment;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $latest_comment_date_by_post_id[ $_comment->comment_post_ID ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,21 +58,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the referenced comment is not in the current batch of comments we need to re-add it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach ( $bulk_comments as $original_id => $_post_id ) {
- if ( ! isset( $comments_by_post_id[ $_comment->comment_post_ID ] ) ) {
- $linked_comment = $_comment->comment_content;
- $parts = wp_parse_url( $linked_comment );
- $comment_id = intval( str_replace( 'comment-', '', $parts['fragment'] ) );
- if ( $comment_id ) {
- $comments_by_post_id[ $_comment->comment_post_ID ][] = get_comment( $comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( $bulk_comments as $original_id => $_comments ) {
+ foreach ( $_comments as $_comment ) {
+ if ( ! isset( $comments_by_post_id[ $_comment->comment_post_ID ] ) ) {
+ $linked_comment = $_comment->comment_content;
+ $parts = wp_parse_url( $linked_comment );
+ $comment_id = intval( str_replace( 'comment-', '', $parts['fragment'] ) );
+ if ( $comment_id ) {
+ $comments_by_post_id[ $_comment->comment_post_ID ][] = get_comment( $comment_id );
+ if ( ! isset( $latest_comment_date_by_post_id[ $_comment->comment_post_ID ] ) ) {
+ $latest_comment_date_by_post_id[ $_comment->comment_post_ID ] = $_comment->comment_date;
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-uasort(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+uksort(
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_by_post_id,
</span><span class="cx" style="display: block; padding: 0 10px"> function( $a, $b ) use ( $latest_comment_date_by_post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $latest_comment_date_by_post_id[ $b->comment_post_ID ] <=> $latest_comment_date_by_post_id[ $a->comment_post_ID ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $latest_comment_date_by_post_id[ $b ] <=> $latest_comment_date_by_post_id[ $a ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>