<!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>[768] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: Code Reference: fix so that approved examples are publicly viewable</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">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/768">768</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2014-07-29 18:57:54 +0000 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Code Reference: fix so that approved examples are publicly viewable
* Make examples publicly viewable, if present
* Hook 'comments_open' to only enable submitting examples by site members
* Add hook 'wporg_devhub-can_user_post_example' to allow overriding default post commenting status
* Temporarily disable any non-example commenting
* Rename wporg_developer_comment() to more appropriate wporg_developer_example()
* Remove unnecessary code-example template</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercommentsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentreferencephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentwpparserhookphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercodeexamplephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/code-example.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercodeexamplephp"></a>
<div class="delfile"><h4>Deleted: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/code-example.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/code-example.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/code-example.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -1,8 +0,0 @@
</span><del>-<?php namespace DevHub; ?>
-
-<?php
- // If comments are open or we have at least one comment, load up the comment template
- if ( comments_open() || '0' != get_comments_number() ) :
- comments_template();
- endif;
-?>
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercommentsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> * define wporg_developer_comment() and that will be used instead.
</span><span class="cx"> * See wporg_developer_comment() in inc/template-tags.php for more.
</span><span class="cx"> */
</span><del>- wp_list_comments( array( 'callback' => 'wporg_developer_comment' ) );
</del><ins>+ wp_list_comments( array( 'callback' => 'wporg_developer_example' ) );
</ins><span class="cx"> ?>
</span><span class="cx"> </ol><!-- .comment-list -->
</span><span class="cx">
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx">
</span><span class="cx"> <?php endif; // have_comments() ?>
</span><span class="cx">
</span><ins>+ <?php if ( DevHub\can_user_post_example( false, get_the_ID() ) ) : ?>
+
</ins><span class="cx"> <p id="add-example" style="display:none;"><a href=""><?php _e( 'Have an example to add?', 'wporg' ); ?></a></p>
</span><span class="cx">
</span><span class="cx"> <?php comment_form( array(
</span><span class="lines">@@ -67,4 +69,6 @@
</span><span class="cx"> 'title_reply' => '', //'Add Example'
</span><span class="cx"> ) ); ?>
</span><span class="cx">
</span><ins>+ <?php endif; ?>
+
</ins><span class="cx"> </div><!-- #comments -->
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentreferencephp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-reference.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -140,11 +140,11 @@
</span><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>- <?php if ( have_comments() || ( comments_open() && is_user_member_of_blog() ) ) : ?>
</del><ins>+ <?php if ( comments_open() || '0' != get_comments_number() ) : ?>
</ins><span class="cx"> <hr/>
</span><span class="cx"> <section class="examples">
</span><span class="cx"> <h2><?php _e( 'Examples', 'wporg' ); ?></h2>
</span><del>- <?php get_template_part( 'code-example' ); ?>
</del><ins>+ <?php comments_template(); /* TODO: add '/examples.php' */ ?>
</ins><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdevelopercontentwpparserhookphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/content-wp-parser-hook.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -83,11 +83,11 @@
</span><span class="cx"> </section>
</span><span class="cx"> */ ?>
</span><span class="cx">
</span><del>- <?php if ( have_comments() || ( comments_open() && is_user_member_of_blog() ) ) : ?>
</del><ins>+ <?php if ( comments_open() || '0' != get_comments_number() ) : ?>
</ins><span class="cx"> <hr/>
</span><span class="cx"> <section class="examples">
</span><span class="cx"> <h2><?php _e( 'Examples', 'wporg' ); ?></h2>
</span><del>- <?php get_template_part( 'code-example' ); ?>
</del><ins>+ <?php comments_template(); /* TODO: add '/examples.php' */ ?>
</ins><span class="cx"> </section>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">
</span><span class="cx"> add_filter( 'the_excerpt', __NAMESPACE__ . '\\lowercase_P_dangit_just_once' );
</span><span class="cx"> add_filter( 'the_content', __NAMESPACE__ . '\\make_doclink_clickable', 10, 5 );
</span><ins>+ add_filter( 'comments_open', __NAMESPACE__ . '\\can_user_post_example', 10, 2 );
</ins><span class="cx">
</span><span class="cx"> // Temporarily disable comments
</span><span class="cx"> //add_filter( 'comments_open', '__return_false' );
</span><span class="lines">@@ -349,7 +350,7 @@
</span><span class="cx"> wp_enqueue_script( 'wporg-developer-navigation', get_template_directory_uri() . '/js/navigation.js', array(), '20120206', true );
</span><span class="cx"> wp_enqueue_script( 'wporg-developer-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
</span><span class="cx">
</span><del>- if ( is_singular() && comments_open() ) {
</del><ins>+ if ( is_singular() && ( '0' != get_comments_number() || post_type_has_source_code() ) ) {
</ins><span class="cx"> wp_enqueue_script( 'wporg-developer-function-reference', get_template_directory_uri() . '/js/function-reference.js', array( 'jquery', 'syntaxhighlighter-core', 'syntaxhighlighter-brush-php' ), '20140515', true );
</span><span class="cx"> wp_enqueue_style( 'syntaxhighlighter-core' );
</span><span class="cx"> wp_enqueue_style( 'syntaxhighlighter-theme-default' );
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperinctemplatetagsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php (767 => 768)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php 2014-07-28 23:13:46 UTC (rev 767)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php 2014-07-29 18:57:54 UTC (rev 768)
</span><span class="lines">@@ -72,13 +72,13 @@
</span><span class="cx"> }
</span><span class="cx"> endif;
</span><span class="cx">
</span><del>- if ( ! function_exists( 'wporg_developer_comment' ) ) :
</del><ins>+ if ( ! function_exists( 'wporg_developer_example' ) ) :
</ins><span class="cx"> /**
</span><del>- * Template for comments and pingbacks.
</del><ins>+ * Template for examples.
</ins><span class="cx"> *
</span><del>- * Used as a callback by wp_list_comments() for displaying the comments.
</del><ins>+ * Used as a callback by wp_list_comments() for displaying the examples.
</ins><span class="cx"> */
</span><del>- function wporg_developer_comment( $comment, $args, $depth ) {
</del><ins>+ function wporg_developer_example( $comment, $args, $depth ) {
</ins><span class="cx"> $GLOBALS['comment'] = $comment;
</span><span class="cx">
</span><span class="cx"> if ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) : ?>
</span><span class="lines">@@ -752,4 +752,39 @@
</span><span class="cx"> return $source_code;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+ /**
+ * Indicates if the current user can post an example.
+ *
+ * This only affects post types wp-parser-* as they are the only things
+ * that can have examples.
+ *
+ * A custom check can be performed by hooking the filter
+ * 'wporg_devhub-can_user_post_example' and returning a
+ * value other than null.
+ *
+ * By default, the ability to post examples is restricted to members of the
+ * blog.
+ *
+ * @param int $post_id The post ID.
+ *
+ * @return bool True if the user can post an example.
+ */
+ function can_user_post_example( $open, $post_id ) {
+
+ // Only proceed if the post type is one that has examples.
+ if ( 0 !== strpos( get_post_type( (int) $post_id ), 'wp-parser-' ) ) {
+ // Temporarily disable commenting that isn't for an example since various
+ // changes need to take place to enable regular commenting.
+ return false; //$open;
+ }
+
+ // Permit default logic to be overridden via filter that returns value other than null.
+ if ( null !== ( $can = apply_filters( 'wporg_devhub-can_user_post_example', null, $post_id ) ) ) {
+ return $can;
+ }
+
+ // Default to limiting ability to post examples to members of the blog.
+ return is_user_member_of_blog();
+ }
+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>