<!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>[5300] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc: Support Forums: Move `Hooks::admin_links()` to `Moderators` class.</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 { 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/5300">5300</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/5300","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-09 08:31:01 +0000 (Sun, 09 Apr 2017)</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'>Support Forums: Move `Hooks::admin_links()` to `Moderators` class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclasshooksphp"></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/support-forums/inc/class-hooks.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/support-forums/inc/class-hooks.php 2017-04-09 08:17:56 UTC (rev 5299)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php 2017-04-09 08:31:01 UTC (rev 5300)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,10 +11,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_option__bbp_edit_lock', array( $this, 'increase_edit_lock_time' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'redirect_canonical', array( $this, 'disable_redirect_guess_404_permalink' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Display-related filters and actions.
- add_filter( 'bbp_topic_admin_links', array( $this, 'admin_links' ), 10, 3 );
- add_filter( 'bbp_reply_admin_links', array( $this, 'admin_links' ), 10, 3 );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Gravatar suppression on lists of topics and revision logs.
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_get_topic_author_link_parse_args', array( $this, 'get_author_link' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_get_reply_author_link_parse_args', array( $this, 'get_author_link' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,44 +95,6 @@
</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">- * Remove some unneeded or redundant admin links for topics and replies,
- * move less commonly used inline quick links to 'Topic Admin' sidebar section.
- *
- * @param array $r Admin links array.
- * @param int $post_id Topic or reply ID.
- * @return array Filtered admin links array.
- */
- public function admin_links( $r, $post_id ) {
- /*
- * Remove 'Trash' from admin links. Trashing a topic or reply will eventually
- * permanently delete it when the trash is emptied. Better to mark it as pending or spam.
- */
- unset( $r['trash'] );
-
- /*
- * Remove 'Reply' link. The theme adds its own 'Reply to Topic' sidebar link
- * for quick access to reply form, making the default inline link redundant.
- */
- unset( $r['reply'] );
-
- /*
- * The following actions are removed from inline quick links as less commonly used,
- * but are still available via 'Topic Admin' sidebar section.
- */
- if ( ! did_action( 'wporg_compat_single_topic_sidebar_pre' ) ) {
- // Remove 'Merge' link.
- unset( $r['merge'] );
-
- // Remove 'Stick' link for moderators, but keep it for plugin/theme authors and contributors.
- if ( current_user_can( 'moderate', $post_id ) ) {
- unset( $r['stick'] );
- }
- }
-
- return $r;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Suppress Gravatars on lists of topics and revision logs.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_author_link( $r ) {
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupportforumsincclassmoderatorsphp"></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/support-forums/inc/class-moderators.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/support-forums/inc/class-moderators.php 2017-04-09 08:17:56 UTC (rev 5299)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-moderators.php 2017-04-09 08:31:01 UTC (rev 5300)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bbp_get_request', array( $this, 'archive_handler' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_has_topics_parse_args', array( $this, 'add_post_status_to_query' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_after_has_replies_parse_args', array( $this, 'add_post_status_to_query' ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Adjust the list of admin links for topics and replies.
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_topic_admin_links', array( $this, 'admin_links' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'bbp_reply_admin_links', array( $this, 'admin_links' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,8 +246,44 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $args;
</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">+ /**
+ * Remove some unneeded or redundant admin links for topics and replies,
+ * move less commonly used inline quick links to 'Topic Admin' sidebar section.
+ *
+ * @param array $r Admin links array.
+ * @param int $post_id Topic or reply ID.
+ * @return array Filtered admin links array.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> public function admin_links( $r, $post_id ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Remove 'Trash' from admin links. Trashing a topic or reply will eventually
+ * permanently delete it when the trash is emptied. Better to mark it as pending or spam.
+ */
+ unset( $r['trash'] );
+
+ /*
+ * Remove 'Reply' link. The theme adds its own 'Reply to Topic' sidebar link
+ * for quick access to reply form, making the default inline link redundant.
+ */
+ unset( $r['reply'] );
+
+ /*
+ * The following actions are removed from inline quick links as less commonly used,
+ * but are still available via 'Topic Admin' sidebar section.
+ */
+ if ( ! did_action( 'wporg_compat_single_topic_sidebar_pre' ) ) {
+ // Remove 'Merge' link.
+ unset( $r['merge'] );
+
+ // Remove 'Stick' link for moderators, but keep it for plugin/theme authors and contributors.
+ if ( current_user_can( 'moderate', $post_id ) ) {
+ unset( $r['stick'] );
+ }
+ }
+
+ // Add 'Archive' link.
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['archive'] = $this->get_archive_link( array( 'post_id' => $post_id ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $r;
</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>