<!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>[1371] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: WordCamp Post Types: Make `get_{speakers|sessions|organizers}_permalink` DRY.</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/1371">1371</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/1371","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-03 23:51:49 +0000 (Tue, 03 Mar 2015)</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 Post Types: Make `get_{speakers|sessions|organizers}_permalink` DRY.
They were exactly the same except the for the shortcode value, so a single DRY method that handles all three cases is easier to maintain and less prone to errors.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincwidgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesincwidgetsphp"></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/plugins/wc-post-types/inc/widgets.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/plugins/wc-post-types/inc/widgets.php 2015-03-03 17:23:42 UTC (rev 1370)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/inc/widgets.php 2015-03-03 23:51:49 UTC (rev 1371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $widget_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $speakers_permalink = $wcpt_plugin->get_speakers_permalink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $speakers_permalink = $wcpt_plugin->get_wcpt_permalink( 'speakers' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $speakers_permalink ) )
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<a class="wcpt-speakers-link" href="%s">%s</a>', esc_url( $speakers_permalink ), esc_html( __( 'View all speakers →', 'wordcamporg' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $widget_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sessions_permalink = $wcpt_plugin->get_sessions_permalink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sessions_permalink = $wcpt_plugin->get_wcpt_permalink( 'sessions' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $sessions_permalink ) )
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<a class="wcpt-sessions-link" href="%s">%s</a>', esc_url( $sessions_permalink ), esc_html( __( 'View all sessions →', 'wordcamporg' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,7 +355,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $widget_content;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $organizers_permalink = $wcpt_plugin->get_organizers_permalink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $organizers_permalink = $wcpt_plugin->get_wcpt_permalink( 'organizers' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $organizers_permalink ) )
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<a class="wcpt-organizers-link" href="%s">%s</a>', esc_url( $organizers_permalink ), esc_html( __( 'Organizing team →', 'wordcamporg' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></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/plugins/wc-post-types/wc-post-types.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/plugins/wc-post-types/wc-post-types.php 2015-03-03 17:23:42 UTC (rev 1370)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php 2015-03-03 23:51:49 UTC (rev 1371)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,11 +7,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require( 'inc/back-compat.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> class WordCamp_Post_Types_Plugin {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected $wcpt_permalinks;
</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"> * Fired when plugin file is loaded.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wcpt_permalinks = array();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_post_types' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_taxonomies' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'init' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,12 +750,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch( $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'wcb_speaker':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $permalink = $this->get_speakers_permalink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $permalink = $this->get_wcpt_permalink( 'speakers' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $anchor_id = $post->post_name;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'wcb_session':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $permalink = $this->get_sessions_permalink();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $permalink = $this->get_wcpt_permalink( 'sessions' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $anchor_id = $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -774,77 +777,45 @@
</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">- * Returns the speakers page permalink
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the page permalink for speakers, sessions or organizers
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fetches for a post or page with the [speakers] shortcode and
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fetches for a post or page with the [speakers | sessions | organizers] shortcode and
</ins><span class="cx" style="display: block; padding: 0 10px"> * returns the permalink of whichever comes first.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param string $type
+ *
+ * @return false | string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function get_speakers_permalink() {
- // todo combine this, get_sessions_permalink, and get_organizers_permalink into a DRY function
-
- if ( isset( $this->speakers_permalink ) )
- return $this->speakers_permalink;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function get_wcpt_permalink( $type ) {
+ if ( ! in_array( $type, array( 'speakers', 'sessions', 'organizers' ) ) ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->speakers_permalink = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * The [schedule] shortcode can call this for each session and speaker, so cache the result to avoid
+ * dozens of SQL queries.
+ */
+ if ( isset( $this->wcpt_permalinks[ $type ] ) ) {
+ return $this->wcpt_permalinks[ $type ];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $speakers_post = get_posts( array(
- 'post_type' => array( 'post', 'page' ),
- 'post_status' => 'publish',
- 's' => '[speakers',
- 'posts_per_page' => 1,
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->wcpt_permalinks[ $type ] = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $speakers_post ) )
- $this->speakers_permalink = get_permalink( $speakers_post[0] );
-
- return $this->speakers_permalink;
- }
-
- /**
- * Returns the sessions page permalink
- */
- function get_sessions_permalink() {
- if ( isset( $this->sessions_permalink ) )
- return $this->sessions_permalink;
-
- $this->sessions_permalink = false;
-
- $sessions_post = get_posts( array(
- 'post_type' => array( 'post', 'page' ),
- 'post_status' => 'publish',
- 's' => '[sessions',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wcpt_post = get_posts( array(
+ 'post_type' => array( 'post', 'page' ),
+ 'post_status' => 'publish',
+ 's' => '[' . $type,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 1,
</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">- if ( ! empty( $sessions_post ) )
- $this->sessions_permalink = get_permalink( $sessions_post[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $wcpt_post ) ) {
+ $this->wcpt_permalinks[ $type ] = get_permalink( $wcpt_post[0] );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $this->sessions_permalink;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->wcpt_permalinks[ $type ];
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns the organizers page permalink
- */
- function get_organizers_permalink() {
- if ( isset( $this->organizers_permalink ) )
- return $this->organizers_permalink;
-
- $this->organizers_permalink = false;
-
- $organizers_post = get_posts( array(
- 'post_type' => array( 'post', 'page' ),
- 'post_status' => 'publish',
- 's' => '[organizers',
- 'posts_per_page' => 1,
- ) );
-
- if ( ! empty( $organizers_post ) )
- $this->organizers_permalink = get_permalink( $organizers_post[0] );
-
- return $this->organizers_permalink;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Converts 'true'/'yes'/true to true, the rest are false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function str_to_bool( $value ) {
</span></span></pre>
</div>
</div>
</body>
</html>