<!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>[8628] sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks: WordCamp Blocks: Move and rename includes/shared.php</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/8628">8628</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/8628","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-11 22:34:41 +0000 (Thu, 11 Apr 2019)</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'>WordCamp Blocks: Move and rename includes/shared.php
We now have several shared include files, and all the other ones are located
in the "shared" subdirectory, so this one should be there, too. Renamed to
"content.php" because the functions it contains are related to retrieving
and/or modifying post content.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksblocksphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksvieworganizersphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewspeakersphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsponsorsphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedcontentphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/content.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/blocks.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,11 +11,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return void
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function load() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ require_once PLUGIN_DIR . 'includes/shared/content.php';
+ require_once PLUGIN_DIR . 'includes/shared/definitions.php';
+ require_once PLUGIN_DIR . 'includes/shared/featured-image.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/shared/grid-layout.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once PLUGIN_DIR . 'includes/shared/featured-image.php';
- require_once PLUGIN_DIR . 'includes/shared/definitions.php';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- require_once PLUGIN_DIR . 'includes/shared.php';
</del><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/organizers.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/sessions.php';
</span><span class="cx" style="display: block; padding: 0 10px"> require_once PLUGIN_DIR . 'includes/speakers.php';
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedcontentphp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/content.php (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared/content.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,75 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordCamp\Blocks\Shared\Content;
+defined( 'WPINC' ) || die();
+
+use WP_Post;
+
+/**
+ * Get the full content of a post, ignoring more and noteaser tags and pagination.
+ *
+ * This works similarly to `the_content`, including applying filters, but:
+ * - It skips all of the logic in `get_the_content` that deals with tags like <!--more--> and
+ * <!--noteaser-->, as well as pagination and global state variables like `$page`, `$more`, and
+ * `$multipage`.
+ * - It returns a string of content, rather than echoing it.
+ *
+ * @param int|WP_Post $post Post ID or post object.
+ *
+ * @return string The full, filtered post content.
+ */
+function get_all_the_content( $post ) {
+ $post = get_post( $post );
+
+ $content = $post->post_content;
+
+ /** This filter is documented in wp-includes/post-template.php */
+ $content = apply_filters( 'the_content', $content );
+ $content = str_replace( ']]>', ']]>', $content );
+
+ return $content;
+}
+
+/**
+ * Convert an array of strings into one string that is a punctuated, human-readable list.
+ *
+ * @param array $array
+ *
+ * @return string
+ */
+function array_to_human_readable_list( array $array ) {
+ $count = count( $array );
+ $list = '';
+
+ switch ( $count ) {
+ case 0:
+ break;
+ case 1:
+ $list = array_shift( $array );
+ break;
+ case 2:
+ $list = sprintf(
+ /* translators: Each %s is a person's name. */
+ _x( '%1$s and %2$s', 'list of two items', 'wordcamporg' ),
+ array_shift( $array ),
+ array_shift( $array )
+ );
+ break;
+ default:
+ /* translators: used between list items, there is a space after the comma */
+ $item_separator = esc_html__( ', ', 'wordcamporg' );
+
+ $initial = array_slice( $array, 0, $count - 1 );
+ $initial = implode( $item_separator, $initial ) . $item_separator;
+ $last = array_slice( $array, -1, 1 )[0];
+
+ $list = sprintf(
+ /* translators: 1: A list of items. 2: The last item in a list of items. */
+ _x( '%1$s and %2$s', 'list of three or more items', 'wordcamporg' ),
+ $initial,
+ $last
+ );
+ break;
+ }
+
+ return $list;
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksincludessharedphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/includes/shared.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,75 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-namespace WordCamp\Blocks\Shared;
-defined( 'WPINC' ) || die();
-
-use WP_Post;
-
-/**
- * Get the full content of a post, ignoring more and noteaser tags and pagination.
- *
- * This works similarly to `the_content`, including applying filters, but:
- * - It skips all of the logic in `get_the_content` that deals with tags like <!--more--> and
- * <!--noteaser-->, as well as pagination and global state variables like `$page`, `$more`, and
- * `$multipage`.
- * - It returns a string of content, rather than echoing it.
- *
- * @param int|WP_Post $post Post ID or post object.
- *
- * @return string The full, filtered post content.
- */
-function get_all_the_content( $post ) {
- $post = get_post( $post );
-
- $content = $post->post_content;
-
- /** This filter is documented in wp-includes/post-template.php */
- $content = apply_filters( 'the_content', $content );
- $content = str_replace( ']]>', ']]>', $content );
-
- return $content;
-}
-
-/**
- * Convert an array of strings into one string that is a punctuated, human-readable list.
- *
- * @param array $array
- *
- * @return string
- */
-function array_to_human_readable_list( array $array ) {
- $count = count( $array );
- $list = '';
-
- switch ( $count ) {
- case 0:
- break;
- case 1:
- $list = array_shift( $array );
- break;
- case 2:
- $list = sprintf(
- /* translators: Each %s is a person's name. */
- _x( '%1$s and %2$s', 'list of two items', 'wordcamporg' ),
- array_shift( $array ),
- array_shift( $array )
- );
- break;
- default:
- /* translators: used between list items, there is a space after the comma */
- $item_separator = esc_html__( ', ', 'wordcamporg' );
-
- $initial = array_slice( $array, 0, $count - 1 );
- $initial = implode( $item_separator, $initial ) . $item_separator;
- $last = array_slice( $array, -1, 1 )[0];
-
- $list = sprintf(
- /* translators: 1: A list of items. 2: The last item in a list of items. */
- _x( '%1$s and %2$s', 'list of three or more items', 'wordcamporg' ),
- $initial,
- $last
- );
- break;
- }
-
- return $list;
-}
</del></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksvieworganizersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/organizers.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Blocks\Organizers;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function WordCamp\Blocks\Shared\{ get_all_the_content };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordCamp\Blocks\Shared\Content\{ get_all_the_content };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsessionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sessions.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Blocks\Sessions;
</span><span class="cx" style="display: block; padding: 0 10px"> use WP_Post;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function WordCamp\Blocks\Shared\{ get_all_the_content, array_to_human_readable_list };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordCamp\Blocks\Shared\Content\{ get_all_the_content, array_to_human_readable_list };
</ins><span class="cx" style="display: block; padding: 0 10px"> use function WordCamp\Blocks\Shared\Components\{ render_featured_image };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewspeakersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/speakers.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Blocks\Speakers;
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function WordCamp\Blocks\Shared\{ get_all_the_content };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordCamp\Blocks\Shared\Content\{ get_all_the_content };
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var array $attributes */
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var array $speakers */
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmupluginsblocksviewsponsorsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php 2019-04-11 21:06:25 UTC (rev 8627)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/blocks/view/sponsors.php 2019-04-11 22:34:41 UTC (rev 8628)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,7 +2,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Blocks\Sponsors;
</span><span class="cx" style="display: block; padding: 0 10px"> defined( 'WPINC' ) || die();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-use function WordCamp\Blocks\Shared\{ get_all_the_content };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+use function WordCamp\Blocks\Shared\Content\{ get_all_the_content };
</ins><span class="cx" style="display: block; padding: 0 10px"> use function WordCamp\Blocks\Shared\Components\{ render_featured_image };
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var array $attributes */
</span></span></pre>
</div>
</div>
</body>
</html>