<!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>[771] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer: Code Reference: permit examples to contain any markup</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/771">771</a></dd>
<dt>Author</dt> <dd>coffee2code</dd>
<dt>Date</dt> <dd>2014-07-30 21:45:32 +0000 (Wed, 30 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Code Reference: permit examples to contain any markup

* Add post_type_supports_examples()
* Permit examples to have any content
* Fully escape content of examples via 'get_comment_text'</pre>

<h3>Modified Paths</h3>
<ul>
<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>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgdeveloperfunctionsphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php (770 => 771)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php        2014-07-30 21:06:09 UTC (rev 770)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php   2014-07-30 21:45:32 UTC (rev 771)
</span><span class="lines">@@ -401,9 +401,36 @@
</span><span class="cx">  remove_filter( 'comment_text',        'wpautop',            30 );
</span><span class="cx"> 
</span><span class="cx">  remove_filter( 'pre_comment_content', 'wp_rel_nofollow',    15 );
</span><ins>+
+       // Be more permissive with content of examples.
+       // Note: the content gets fully escaped via 'get_comment_text'.
+       if ( post_type_supports_examples() ) {
+               if ( current_user_can( 'unfiltered_html' ) ) {
+                       remove_filter( 'pre_comment_content', 'wp_filter_post_kses' );
+               } else {
+                       remove_filter( 'pre_comment_content', 'wp_filter_kses' );
+               }
+       }
+
+       add_filter( 'get_comment_text',  __NAMESPACE__ . '\\escape_example_content' );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><ins>+ * Escapes the entirety of the content for examples.
+ *
+ * @param  string $text The comment/example content.
+ * @return string
+ */
+function escape_example_content( $text ) {
+       // Only proceed if the post type is one that has examples.
+       if ( ! post_type_supports_examples() ) {
+               return $text;
+       }
+
+       return htmlentities( $text );
+}
+
+/**
</ins><span class="cx">  * Disables commenting to invalid or non-users.
</span><span class="cx">  *
</span><span class="cx">  * @param bool  $status Default commenting status for post.
</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 (770 => 771)</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-30 21:06:09 UTC (rev 770)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php   2014-07-30 21:45:32 UTC (rev 771)
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">                          <li id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
</span><span class="cx">                          <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
</span><span class="cx">                                  <div class="comment-content code-example-container">
</span><del>-                                               <pre class="brush: php; toolbar: false;"><?php echo htmlentities( get_comment_text() ); ?></pre>
</del><ins>+                                                <pre class="brush: php; toolbar: false;"><?php comment_text(); /* Fully escaped via filter */ ?></pre>
</ins><span class="cx">                                   </div>
</span><span class="cx">                                  <!-- .comment-content -->
</span><span class="cx"> 
</span><span class="lines">@@ -670,6 +670,19 @@
</span><span class="cx">  }
</span><span class="cx"> 
</span><span class="cx">  /**
</span><ins>+        * Does the post type support having examples?
+        *
+        * @param  string  Optional. The post type name. If blank, assumes current post type.
+        *
+        * @return boolean
+        */
+       function post_type_supports_examples( $post_type = null ) {
+               $post_type = $post_type ? $post_type : get_post_type();
+
+               return ( 0 === strpos( $post_type, 'wp-parser-' ) );
+       }
+
+       /**
</ins><span class="cx">    * Retrieve the root directory of the parsed WP code.
</span><span class="cx">   *
</span><span class="cx">   * If the option 'wp_parser_root_import_dir' (as set by the parser) is not
</span></span></pre>
</div>
</div>

</body>
</html>