<!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>[761] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php: WordCamp Post Type: Require an e-mail address before setting as pending.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/761">761</a></dd>
<dt>Author</dt> <dd>iandunn</dd>
<dt>Date</dt> <dd>2014-07-25 00:24:11 +0000 (Fri, 25 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WordCamp Post Type: Require an e-mail address before setting as pending.
There are automated emails that get sent when the post is promoted to a pending status, so we need an e-mail
address at that time or we can't send them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampadminphp"></a>
<div class="modfile"><h4>Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php (760 => 761)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2014-07-25 00:21:45 UTC (rev 760)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-admin.php 2014-07-25 00:24:11 UTC (rev 761)
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Prevent WordCamp posts from being published until all the required fields are completed.
</del><ins>+ * Prevent WordCamp posts from being set to pending or published until all the required fields are completed.
</ins><span class="cx"> *
</span><span class="cx"> * @param array $post_data
</span><span class="cx"> * @param array $post_data_raw
</span><span class="lines">@@ -511,7 +511,9 @@
</span><span class="cx"> // The ID of the last site that was created before this rule went into effect, so that we don't apply the rule retroactively.
</span><span class="cx"> $min_site_id = apply_filters( 'wcpt_require_complete_meta_min_site_id', '2416297' );
</span><span class="cx">
</span><del>- $required_fields = array(
</del><ins>+ $required_pending_fields = array( 'E-mail Address' );
+
+ $required_publish_fields = array(
</ins><span class="cx"> // WordCamp
</span><span class="cx"> 'Start Date (YYYY-mm-dd)',
</span><span class="cx"> 'Location',
</span><span class="lines">@@ -538,8 +540,22 @@
</span><span class="cx"> 'Website URL',
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ // Check pending posts
+ if ( WCPT_POST_TYPE_ID == $post_data['post_type'] && 'pending' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
+ foreach( $required_pending_fields as $field ) {
+ $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
+
+ if ( empty( $value ) || 'null' == $value ) {
+ $post_data['post_status'] = 'draft';
+ $this->active_admin_notices[] = 3;
+ break;
+ }
+ }
+ }
+
+ // Check published posts
</ins><span class="cx"> if ( WCPT_POST_TYPE_ID == $post_data['post_type'] && 'publish' == $post_data['post_status'] && absint( $_POST['post_ID'] ) > $min_site_id ) {
</span><del>- foreach( $required_fields as $field ) {
</del><ins>+ foreach( $required_publish_fields as $field ) {
</ins><span class="cx"> $value = $_POST[ wcpt_key_to_str( $field, 'wcpt_' ) ];
</span><span class="cx">
</span><span class="cx"> if ( empty( $value ) || 'null' == $value ) {
</span><span class="lines">@@ -609,6 +625,11 @@
</span><span class="cx"> $post->post_status
</span><span class="cx"> )
</span><span class="cx"> ),
</span><ins>+
+ 3 => array(
+ 'type' => 'error',
+ 'notice' => __( 'This WordCamp cannot be set to pending until all of its required metadata is filled in.', 'wordcamporg' ),
+ ),
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_REQUEST['wcpt_messages'] ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>