<!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>[2877] sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt: WordCamp Post Type: Whitespace cleanup.</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/2877">2877</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/2877","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>2016-04-01 21:16:09 +0000 (Fri, 01 Apr 2016)</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 Type: Whitespace cleanup.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewswordcampmetaboxstatusphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptadminphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-admin.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptfunctionsphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptloaderphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php</a></li>
<li><a href="#sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamptemplatephp">sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptviewswordcampmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/views/wordcamp/metabox-status.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- #minor-publishing -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="major-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'delete_post', $post->ID ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,4 +61,4 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div> <!-- #major-publishing-actions -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div> <!-- .submitbox -->
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</div> <!-- .submitbox -->
</ins></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-admin.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-admin.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,17 +84,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Add some general styling to the admin area
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_head () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css" media="screen">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*<![CDATA[*/
-<?php
- // Add extra actions to WordCamp Post Type admin header area
- do_action( 'wcpt_admin_head' );
-?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*<![CDATA[*/
+ <?php
+ // Add extra actions to WordCamp Post Type admin header area
+ do_action( 'wcpt_admin_head' );
+ ?>
+ /*]]>*/
+ </style>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*]]>*/
- </style>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,18 +125,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wcpt_has_access() )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
- <h3><?php _e( 'WordCamps', 'wcpt' ); ?></h3>
- <table class="form-table">
- <tr valign="top">
- <th scope="row"><?php _e( 'WordCamps', 'wcpt' ); ?></th>
- <td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
+ <h3><?php _e( 'WordCamps', 'wcpt' ); ?></h3>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </td>
- </tr>
- </table>
-<?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <table class="form-table">
+ <tr valign="top">
+ <th scope="row"><?php _e( 'WordCamps', 'wcpt' ); ?></th>
+ <td>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </td>
+ </tr>
+ </table>
+ <?php
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add extra actions to WordCamp Post Type profile update
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wcpt_user_profile_wordcamps' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +172,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through menu order and do some rearranging
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu_order as $index => $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Current item is our forum CPT, so set our separator here
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ( 'edit.php?post_type=' . WCPT_POST_TYPE_ID ) == $item ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wcpt_menu_order[] = 'separator-wcpt';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,7 +181,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Skip our separator
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !in_array( $item, array( 'separator-wcpt' ) ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wcpt_menu_order[] = $item;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> // Return our custom order
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-functions.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool $has_access
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wcpt_has_access () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_super_admin () )
</span><span class="cx" style="display: block; padding: 0 10px"> $has_access = true;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-loader.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,5 +82,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif; // class_exists check
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load everything up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wcpt_loader = new WCPT_Loader;
-$wordcamp_loader = new WordCamp_Loader;
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wcpt_loader = new WCPT_Loader;
+$wordcamp_loader = new WordCamp_Loader;
</ins></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,8 +122,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $statuses = WordCamp_Loader::get_post_statuses();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_meta_box( 'submitdiv', __( 'Status', 'wordcamporg' ), array( $this, 'metabox_status' ),
- WCPT_POST_TYPE_ID, 'side', 'high' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_meta_box(
+ 'submitdiv',
+ __( 'Status', 'wordcamporg' ),
+ array( $this, 'metabox_status' ),
+ WCPT_POST_TYPE_ID,
+ 'side',
+ 'high'
+ );
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +141,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function metabox_save( $post_id, $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Don't add/remove meta on revisions and auto-saves
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_is_post_autosave( $post_id ) || wp_is_post_revision( $post_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +170,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through meta keys and update
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wcpt_meta_keys as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Get post value
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = wcpt_key_to_str( $key, 'wcpt_' );
</span><span class="cx" style="display: block; padding: 0 10px"> $values[ $key ] = isset( $_POST[ $post_value ] ) ? esc_attr( $_POST[ $post_value ] ) : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +227,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">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Geocode the given address into a latitude and longitude pair.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +263,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function meta_keys( $meta_group = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Warning: These keys are used for both the input field label and the postmeta key, so if you want to
</span><span class="cx" style="display: block; padding: 0 10px"> * modify an existing label then you'll also need to migrate any rows in the database to use the new key.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,43 +277,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $meta_group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'organizer':
</span><span class="cx" style="display: block; padding: 0 10px"> $retval = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Organizer Name' => 'text',
- 'WordPress.org Username' => 'text',
- 'Email Address' => 'text', // Note: This is the lead organizer's e-mail address, which is different than the "E-mail Address" field
- 'Telephone' => 'text',
- 'Mailing Address' => 'textarea',
- 'Sponsor Wrangler Name' => 'text',
- 'Sponsor Wrangler E-mail Address' => 'text',
- 'Budget Wrangler Name' => 'text',
- 'Budget Wrangler E-mail Address' => 'text',
- 'Venue Wrangler Name' => 'text',
- 'Venue Wrangler E-mail Address' => 'text',
- 'Speaker Wrangler Name' => 'text',
- 'Speaker Wrangler E-mail Address' => 'text',
- 'Food/Beverage Wrangler Name' => 'text',
- 'Food/Beverage Wrangler E-mail Address' => 'text',
- 'Swag Wrangler Name' => 'text',
- 'Swag Wrangler E-mail Address' => 'text',
- 'Volunteer Wrangler Name' => 'text',
- 'Volunteer Wrangler E-mail Address' => 'text',
- 'Printing Wrangler Name' => 'text',
- 'Printing Wrangler E-mail Address' => 'text',
- 'Design Wrangler Name' => 'text',
- 'Design Wrangler E-mail Address' => 'text',
- 'Website Wrangler Name' => 'text',
- 'Website Wrangler E-mail Address' => 'text',
- 'Social Media/Publicity Wrangler Name' => 'text',
- 'Social Media/Publicity Wrangler E-mail Address' => 'text',
- 'A/V Wrangler Name' => 'text',
- 'A/V Wrangler E-mail Address' => 'text',
- 'Party Wrangler Name' => 'text',
- 'Party Wrangler E-mail Address' => 'text',
- 'Travel Wrangler Name' => 'text',
- 'Travel Wrangler E-mail Address' => 'text',
- 'Safety Wrangler Name' => 'text',
- 'Safety Wrangler E-mail Address' => 'text',
- 'Mentor Name' => 'text',
- 'Mentor E-mail Address' => 'text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Organizer Name' => 'text',
+ 'WordPress.org Username' => 'text',
+ 'Email Address' => 'text', // Note: This is the lead organizer's e-mail address, which is different than the "E-mail Address" field
+ 'Telephone' => 'text',
+ 'Mailing Address' => 'textarea',
+ 'Sponsor Wrangler Name' => 'text',
+ 'Sponsor Wrangler E-mail Address' => 'text',
+ 'Budget Wrangler Name' => 'text',
+ 'Budget Wrangler E-mail Address' => 'text',
+ 'Venue Wrangler Name' => 'text',
+ 'Venue Wrangler E-mail Address' => 'text',
+ 'Speaker Wrangler Name' => 'text',
+ 'Speaker Wrangler E-mail Address' => 'text',
+ 'Food/Beverage Wrangler Name' => 'text',
+ 'Food/Beverage Wrangler E-mail Address' => 'text',
+ 'Swag Wrangler Name' => 'text',
+ 'Swag Wrangler E-mail Address' => 'text',
+ 'Volunteer Wrangler Name' => 'text',
+ 'Volunteer Wrangler E-mail Address' => 'text',
+ 'Printing Wrangler Name' => 'text',
+ 'Printing Wrangler E-mail Address' => 'text',
+ 'Design Wrangler Name' => 'text',
+ 'Design Wrangler E-mail Address' => 'text',
+ 'Website Wrangler Name' => 'text',
+ 'Website Wrangler E-mail Address' => 'text',
+ 'Social Media/Publicity Wrangler Name' => 'text',
+ 'Social Media/Publicity Wrangler E-mail Address' => 'text',
+ 'A/V Wrangler Name' => 'text',
+ 'A/V Wrangler E-mail Address' => 'text',
+ 'Party Wrangler Name' => 'text',
+ 'Party Wrangler E-mail Address' => 'text',
+ 'Travel Wrangler Name' => 'text',
+ 'Travel Wrangler E-mail Address' => 'text',
+ 'Safety Wrangler Name' => 'text',
+ 'Safety Wrangler E-mail Address' => 'text',
+ 'Mentor Name' => 'text',
+ 'Mentor E-mail Address' => 'text',
</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"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,43 +357,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Number of Anticipated Attendees' => 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Multi-Event Sponsor Region' => 'mes-dropdown',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Organizer Name' => 'text',
- 'WordPress.org Username' => 'text',
- 'Email Address' => 'text',
- 'Telephone' => 'text',
- 'Mailing Address' => 'textarea',
- 'Sponsor Wrangler Name' => 'text',
- 'Sponsor Wrangler E-mail Address' => 'text',
- 'Budget Wrangler Name' => 'text',
- 'Budget Wrangler E-mail Address' => 'text',
- 'Venue Wrangler Name' => 'text',
- 'Venue Wrangler E-mail Address' => 'text',
- 'Speaker Wrangler Name' => 'text',
- 'Speaker Wrangler E-mail Address' => 'text',
- 'Food/Beverage Wrangler Name' => 'text',
- 'Food/Beverage Wrangler E-mail Address' => 'text',
- 'Swag Wrangler Name' => 'text',
- 'Swag Wrangler E-mail Address' => 'text',
- 'Volunteer Wrangler Name' => 'text',
- 'Volunteer Wrangler E-mail Address' => 'text',
- 'Printing Wrangler Name' => 'text',
- 'Printing Wrangler E-mail Address' => 'text',
- 'Design Wrangler Name' => 'text',
- 'Design Wrangler E-mail Address' => 'text',
- 'Website Wrangler Name' => 'text',
- 'Website Wrangler E-mail Address' => 'text',
- 'Social Media/Publicity Wrangler Name' => 'text',
- 'Social Media/Publicity Wrangler E-mail Address' => 'text',
- 'A/V Wrangler Name' => 'text',
- 'A/V Wrangler E-mail Address' => 'text',
- 'Party Wrangler Name' => 'text',
- 'Party Wrangler E-mail Address' => 'text',
- 'Travel Wrangler Name' => 'text',
- 'Travel Wrangler E-mail Address' => 'text',
- 'Safety Wrangler Name' => 'text',
- 'Safety Wrangler E-mail Address' => 'text',
- 'Mentor Name' => 'text',
- 'Mentor E-mail Address' => 'text',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'Organizer Name' => 'text',
+ 'WordPress.org Username' => 'text',
+ 'Email Address' => 'text',
+ 'Telephone' => 'text',
+ 'Mailing Address' => 'textarea',
+ 'Sponsor Wrangler Name' => 'text',
+ 'Sponsor Wrangler E-mail Address' => 'text',
+ 'Budget Wrangler Name' => 'text',
+ 'Budget Wrangler E-mail Address' => 'text',
+ 'Venue Wrangler Name' => 'text',
+ 'Venue Wrangler E-mail Address' => 'text',
+ 'Speaker Wrangler Name' => 'text',
+ 'Speaker Wrangler E-mail Address' => 'text',
+ 'Food/Beverage Wrangler Name' => 'text',
+ 'Food/Beverage Wrangler E-mail Address' => 'text',
+ 'Swag Wrangler Name' => 'text',
+ 'Swag Wrangler E-mail Address' => 'text',
+ 'Volunteer Wrangler Name' => 'text',
+ 'Volunteer Wrangler E-mail Address' => 'text',
+ 'Printing Wrangler Name' => 'text',
+ 'Printing Wrangler E-mail Address' => 'text',
+ 'Design Wrangler Name' => 'text',
+ 'Design Wrangler E-mail Address' => 'text',
+ 'Website Wrangler Name' => 'text',
+ 'Website Wrangler E-mail Address' => 'text',
+ 'Social Media/Publicity Wrangler Name' => 'text',
+ 'Social Media/Publicity Wrangler E-mail Address' => 'text',
+ 'A/V Wrangler Name' => 'text',
+ 'A/V Wrangler E-mail Address' => 'text',
+ 'Party Wrangler Name' => 'text',
+ 'Party Wrangler E-mail Address' => 'text',
+ 'Travel Wrangler Name' => 'text',
+ 'Travel Wrangler E-mail Address' => 'text',
+ 'Safety Wrangler Name' => 'text',
+ 'Safety Wrangler E-mail Address' => 'text',
+ 'Mentor Name' => 'text',
+ 'Mentor E-mail Address' => 'text',
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> 'Venue Name' => 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> 'Physical Address' => 'textarea',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,6 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function admin_print_scripts() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type() == WCPT_POST_TYPE_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"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,7 +469,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function user_profile_update( $user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !wcpt_has_access() )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,18 +479,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Everything
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function user_profile_wordcamp( $profileuser ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( !wcpt_has_access() )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><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"> <h3><?php _e( 'WordCamps', 'wcpt' ); ?></h3>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr valign="top">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><?php _e( 'WordCamps', 'wcpt' ); ?></th>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -557,7 +558,6 @@
</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 'wcpt_date' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Has a start date
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $start = wcpt_get_wordcamp_start_date() ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -611,6 +611,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo implode( ' - ', (array) $wc );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 $actions;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +723,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"> if ( ! empty( $post_data['post_status'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Only network admins can change WordCamp statuses.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'network_admin' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = $post->post_status;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,7 +929,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function original_application_metabox( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $application_data = get_post_meta( $post->ID, '_application_data', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> require_once( WCPT_DIR . 'views/wordcamp/metabox-original-application.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamploaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-loader.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,12 +1,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-define( 'WCPT_POST_TYPE_ID', 'wordcamp' );
-define( 'WCPT_YEAR_ID', 'wordcamp_year' );
-define( 'WCPT_SLUG', 'wordcamps' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+define( 'WCPT_POST_TYPE_ID', 'wordcamp' );
+define( 'WCPT_YEAR_ID', 'wordcamp_year' );
+define( 'WCPT_SLUG', 'wordcamps' );
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'WCPT_DEFAULT_STATUS', 'wcpt-needs-vetting' );
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WCPT_FINAL_STATUS', 'wcpt-closed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// todo realign
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( !class_exists( 'WordCamp_Loader' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! class_exists( 'WordCamp_Loader' ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * WordCamp_Loader
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The main WordCamp Post Type loader
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'plugins_loaded', array( $this, 'includes' ) );
-
- add_action( 'init', array( $this, 'register_post_types' ) );
- add_action( 'init', array( $this, 'register_post_statuses' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'plugins_loaded', array( $this, 'includes' ) );
+ add_action( 'init', array( $this, 'register_post_types' ) );
+ add_action( 'init', array( $this, 'register_post_statuses' ) );
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +34,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses is_admin If in WordPress admin, load additional file
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function includes () {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // Load the files
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-template.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ( WCPT_DIR . 'wcpt-wordcamp/wordcamp-admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( WCPT_DIR . 'wcpt-wordcamp/wordcamp-new-site.php' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['wordcamp_new_site'] = new WordCamp_New_Site;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,22 +54,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @todo Finish up the post type admin area with messages, columns, etc...*
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_types() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> // WordCamp post type labels
</span><span class="cx" style="display: block; padding: 0 10px"> $wcpt_labels = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'WordCamps', 'wcpt' ),
- 'singular_name' => __( 'WordCamp', 'wcpt' ),
- 'add_new' => __( 'Add New', 'wcpt' ),
- 'add_new_item' => __( 'Create New WordCamp', 'wcpt' ),
- 'edit' => __( 'Edit', 'wcpt' ),
- 'edit_item' => __( 'Edit WordCamp', 'wcpt' ),
- 'new_item' => __( 'New WordCamp', 'wcpt' ),
- 'view' => __( 'View WordCamp', 'wcpt' ),
- 'view_item' => __( 'View WordCamp', 'wcpt' ),
- 'search_items' => __( 'Search WordCamps', 'wcpt' ),
- 'not_found' => __( 'No WordCamps found', 'wcpt' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'WordCamps', 'wcpt' ),
+ 'singular_name' => __( 'WordCamp', 'wcpt' ),
+ 'add_new' => __( 'Add New', 'wcpt' ),
+ 'add_new_item' => __( 'Create New WordCamp', 'wcpt' ),
+ 'edit' => __( 'Edit', 'wcpt' ),
+ 'edit_item' => __( 'Edit WordCamp', 'wcpt' ),
+ 'new_item' => __( 'New WordCamp', 'wcpt' ),
+ 'view' => __( 'View WordCamp', 'wcpt' ),
+ 'view_item' => __( 'View WordCamp', 'wcpt' ),
+ 'search_items' => __( 'Search WordCamps', 'wcpt' ),
+ 'not_found' => __( 'No WordCamps found', 'wcpt' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'not_found_in_trash' => __( 'No WordCamps found in Trash', 'wcpt' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'parent_item_colon' => __( 'Parent WordCamp:', 'wcpt' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'parent_item_colon' => __( 'Parent WordCamp:', 'wcpt' )
</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"> // WordCamp post type rewrite
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,28 +124,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_post_statuses() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-needs-vetting' => _x( 'Needs Vetting', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-orientati' => _x( 'Needs Orientation/Interview', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-more-info-reque' => _x( 'More Info Requested', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-rejection' => _x( 'Needs Rejection E-mail', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-interview-sched' => _x( 'Interview/Orientation Scheduled', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-rejected' => _x( 'Rejected', 'wordcamp status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcpt-needs-vetting' => _x( 'Needs Vetting', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-orientati' => _x( 'Needs Orientation/Interview', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-more-info-reque' => _x( 'More Info Requested', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-rejection' => _x( 'Needs Rejection E-mail', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-interview-sched' => _x( 'Interview/Orientation Scheduled', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-rejected' => _x( 'Rejected', 'wordcamp status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wcpt-approved-pre-pl' => _x( 'Approved for Pre-Planning Pending Agreement', 'wordcamp status', 'wordcamporg' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcpt-needs-email' => _x( 'Needs E-mail Address', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-site' => _x( 'Needs Site', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-polldaddy' => _x( 'Needs Polldaddy Account', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-mentor' => _x( 'Needs Mentor', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-pre-plann' => _x( 'Needs to be Added to Pre-Planning Schedule', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-pre-planning' => _x( 'In Pre-Planning', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-budget-re' => _x( 'Needs Budget Review', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-budget-rev-sche' => _x( 'Budget Review Scheduled', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-contract' => _x( 'Needs Contract to be Signed', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-fill-list' => _x( 'Needs to Fill Out WordCamp Listing', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-schedule' => _x( 'Needs to be Added to Official Schedule', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-scheduled' => _x( 'WordCamp Scheduled', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-needs-debrief' => _x( 'Needs Debrief', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-debrief-schedul' => _x( 'Debrief Scheduled', 'wordcamp status', 'wordcamporg' ),
- 'wcpt-closed' => _x( 'WordCamp Closed', 'wordcamp status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcpt-needs-email' => _x( 'Needs E-mail Address', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-site' => _x( 'Needs Site', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-polldaddy' => _x( 'Needs Polldaddy Account', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-mentor' => _x( 'Needs Mentor', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-pre-plann' => _x( 'Needs to be Added to Pre-Planning Schedule', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-pre-planning' => _x( 'In Pre-Planning', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-budget-re' => _x( 'Needs Budget Review', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-budget-rev-sche' => _x( 'Budget Review Scheduled', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-contract' => _x( 'Needs Contract to be Signed', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-fill-list' => _x( 'Needs to Fill Out WordCamp Listing', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-schedule' => _x( 'Needs to be Added to Official Schedule', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-scheduled' => _x( 'WordCamp Scheduled', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-needs-debrief' => _x( 'Needs Debrief', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-debrief-schedul' => _x( 'Debrief Scheduled', 'wordcamp status', 'wordcamporg' ),
+ 'wcpt-closed' => _x( 'WordCamp Closed', 'wordcamp status', 'wordcamporg' ),
</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></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the new blog is https.
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', set_url_scheme( get_option( 'siteurl' ), 'https' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_option( 'home', set_url_scheme( get_option( 'home' ), 'https' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_option( 'home', set_url_scheme( get_option( 'home' ), 'https' ) );
</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></span></pre></div>
<a id="sitesbranchesapplicationtrackingwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcamptemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-template.php 2016-04-01 20:53:57 UTC (rev 2876)
+++ sites/branches/application-tracking/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-template.php 2016-04-01 21:16:09 UTC (rev 2877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,10 +13,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Possible arguments to change returned WordCamps
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object Multidimensional array of WordCamp information
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_has_wordcamps ( $args = '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_has_wordcamps( $args = '' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $default = array (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Narrow query down to WordCamp Post Type
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => WCPT_POST_TYPE_ID,
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wcpt_template
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object WordCamp information
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamps () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamps() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px"> return $wcpt_template->have_posts();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wcpt_template
</span><span class="cx" style="display: block; padding: 0 10px"> * @return object WordCamp information
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_the_wordcamp () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_the_wordcamp() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px"> return $wcpt_template->the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,7 +116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_id()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_id () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string WordCamp id
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_id () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_id() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wcpt_template->post ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_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">-function wcpt_wordcamp_permalink ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_permalink( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_permalink( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses get_permalink
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Permanent link to WordCamp
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_permalink ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_permalink( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,7 +189,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_title()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_title ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_title( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_title( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Title of WordCamp
</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">- function wcpt_get_wordcamp_title ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_title( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wcpt_get_wordcamp_title', get_the_title( $wordcamp_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_link()
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_link ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_link( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_link( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +241,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Title of WordCamp
</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">- function wcpt_get_wordcamp_link ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_link( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = get_the_title( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_start_date()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_start_date ( $wordcamp_id = 0, $format = 'F j, Y' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_start_date( $wordcamp_id = 0, $format = 'F j, Y' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_start_date( $wordcamp_id, $format );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_start_date ( $wordcamp_id = 0, $format = 'F j, Y' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_start_date( $wordcamp_id = 0, $format = 'F j, Y' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_end_date()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_end_date ( $wordcamp_id = 0, $format = 'F j, Y' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_end_date( $wordcamp_id = 0, $format = 'F j, Y' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_end_date( $wordcamp_id, $format );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_end_date ( $wordcamp_id = 0, $format = 'F j, Y' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_end_date( $wordcamp_id = 0, $format = 'F j, Y' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -342,7 +342,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_location()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_location ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_location( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_location( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_location ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_location( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_organizer_name()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_organizer_name ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_organizer_name( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_organizer_name( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_organizer_name ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_organizer_name( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,7 +410,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_venue_name()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_venue_name ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_venue_name( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_venue_name( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_venue_name ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_venue_name( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @uses wcpt_get_wordcamp_url()
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_url ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_url( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_url( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $wordcamp_id optional
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_url ( $wordcamp_id = 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_url( $wordcamp_id = 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,7 +477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wcpt_template
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_pagination_count () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_pagination_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_pagination_count();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -492,7 +492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wcpt_template
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_pagination_count () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_pagination_count() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set pagination values
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Template Tags
</span><span class="cx" style="display: block; padding: 0 10px"> * @since WordCamp Post Type (0.1)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_pagination_links () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wcpt_wordcamp_pagination_links() {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wcpt_get_wordcamp_pagination_links();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -535,7 +535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wcpt_template
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function wcpt_get_wordcamp_pagination_links () {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_pagination_links() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wcpt_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wcpt_get_wordcamp_pagination_links', $wcpt_template->pagination_links );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,12 +546,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Moved from WordCamp Central functions.php
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wcpt_wordcamp_physical_address' ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_physical_address( $wordcamp_id = 0 ) {
- echo wp_filter_kses( nl2br( wcpt_get_wordcamp_physical_address( $wordcamp_id ) ) );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_wordcamp_physical_address( $wordcamp_id = 0 ) {
+ echo wp_filter_kses( nl2br( wcpt_get_wordcamp_physical_address( $wordcamp_id ) ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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 ( ! function_exists( 'wcpt_get_wordcamp_physical_address' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! function_exists( 'wcpt_get_wordcamp_physical_address' ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> function wcpt_get_wordcamp_physical_address( $wordcamp_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,15 +559,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $address = get_post_meta( $wordcamp_id, 'Physical Address', true );
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wcpt_get_wordcamp_physical_address', $address );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wcpt_wordcamp_venue_url' ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_wordcamp_venue_url( $wordcamp_id = 0 ) {
- echo esc_url( wcpt_get_wordcamp_venue_url( $wordcamp_id ) );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_wordcamp_venue_url( $wordcamp_id = 0 ) {
+ echo esc_url( wcpt_get_wordcamp_venue_url( $wordcamp_id ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</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 ( ! function_exists( 'wcpt_get_wordcamp_venue_url' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! function_exists( 'wcpt_get_wordcamp_venue_url' ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> function wcpt_get_wordcamp_venue_url( $wordcamp_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wordcamp_id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_id = wcpt_get_wordcamp_id();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -575,16 +575,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $venue_url = get_post_meta( $wordcamp_id, 'Website URL', true );
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wcpt_get_wordcamp_venue_url', $venue_url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+endif;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'wcpt_get_wordcamp_twitter_screen_name' ) ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wcpt_get_wordcamp_twitter_screen_name( $wordcamp_id = 0 ) {
- if ( empty( $wordcamp_id ) )
- $wordcamp_id = wcpt_get_wordcamp_id();
-
- $screen_name = get_post_meta( $wordcamp_id, 'Twitter', true );
- return apply_filters( 'wcpt_get_wordcamp_twitter_screen_name', $screen_name );
-}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function wcpt_get_wordcamp_twitter_screen_name( $wordcamp_id = 0 ) {
+ if ( empty( $wordcamp_id ) )
+ $wordcamp_id = wcpt_get_wordcamp_id();
+
+ $screen_name = get_post_meta( $wordcamp_id, 'Twitter', true );
+ return apply_filters( 'wcpt_get_wordcamp_twitter_screen_name', $screen_name );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,4 +655,4 @@
</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"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_head', 'add_wordcamp_feed_link_to_head', 4 ); // after feed_links_extra()
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+add_action( 'wp_head', 'add_wordcamp_feed_link_to_head', 4 ); // after feed_links_extra()
</ins></span></pre>
</div>
</div>
</body>
</html>