<!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>[4255] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php: WordCamp Post Type: Clean up formatting.</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/4255">4255</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/4255","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-10-18 00:22:06 +0000 (Tue, 18 Oct 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: Clean up formatting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcptwcptwordcampwordcampnewsitephp"></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/wcpt/wcpt-wordcamp/wordcamp-new-site.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/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-10-18 00:22:01 UTC (rev 4254)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wcpt/wcpt-wordcamp/wordcamp-new-site.php 2016-10-18 00:22:06 UTC (rev 4255)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,10 +11,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->new_site_id = 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">- add_action( 'wcpt_metabox_value', array( $this, 'render_site_url_field' ), 10, 3 );
- add_action( 'wcpt_metabox_save', array( $this, 'save_site_url_field' ), 10, 3 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wcpt_metabox_value', array( $this, 'render_site_url_field' ), 10, 3 );
+ add_action( 'wcpt_metabox_save', array( $this, 'save_site_url_field' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wcpt_metabox_save_done', array( $this, 'maybe_create_new_site' ), 10, 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_action( 'wcpt_metabox_save_done', array( $this, 'maybe_push_mes' ), 10, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wcpt_metabox_save_done', array( $this, 'maybe_push_mes' ), 10, 1 );
</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">@@ -30,9 +30,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'URL' == $key && 'wc-url' == $field_type ) : ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input
+ type="text"
+ size="36"
+ name="<?php echo esc_attr( $object_name ); ?>"
+ id="<?php echo esc_attr( $object_name ); ?>"
+ value="<?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?>"
+ />
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="text" size="36" name="<?php echo esc_attr( $object_name ); ?>" id="<?php echo esc_attr( $object_name ); ?>" value="<?php echo esc_attr( get_post_meta( $post_id, $key, true ) ); ?>" />
-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'manage_sites' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $url = parse_url( trailingslashit( get_post_meta( $post_id, $key, true ) ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $url['host'], $url['path'] ) && domain_exists( $url['host'], $url['path'], 1 ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,19 +55,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Create site in network
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="description">(e.g., https://<?php echo date('Y'); ?>.city.wordcamp.org)</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="description">(e.g., https://<?php echo date( 'Y' ); ?>.city.wordcamp.org)</span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // domain_exists ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; // current_user_can ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php endif;
</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><span class="cx" style="display: block; padding: 0 10px"> * Save the URL field value
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param $key
- * @param $field_type
- * @param $wordcamp_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $key
+ * @param string $field_type
+ * @param int $wordcamp_id
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function save_site_url_field( $key, $field_type, $wordcamp_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $switched;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,11 +81,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'URL' == $key && 'wc-url' == $field_type && isset( $_POST[ $field_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = strtolower( substr( $_POST[ $field_name ], 0, 4 ) ) == 'http' ? $_POST[ $field_name ] : 'http://' . $_POST[ $field_name ];
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( esc_url_raw( $url ), 'https' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $wordcamp_id, $key, esc_url( $url ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this site exists make sure we update the _site_id mapping.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = parse_url( $url, PHP_URL_PATH ) ? parse_url( $url, PHP_URL_PATH ) : '/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = parse_url( $url, PHP_URL_PATH ) ? parse_url( $url, PHP_URL_PATH ) : '/';
</ins><span class="cx" style="display: block; padding: 0 10px"> $existing_site_id = domain_exists( parse_url( $url, PHP_URL_HOST ), $path, 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $existing_site_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $wordcamp_id, '_site_id', absint( $existing_site_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Maybe create a new site in the network
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $wordcamp_id
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $wordcamp_id
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function maybe_create_new_site( $wordcamp_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'manage_sites' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,11 +126,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Logger\log( 'return_invalid_url', compact( 'wordcamp_id', 'url', 'url_components' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $path = isset( $url_components['path'] ) ? $url_components['path'] : '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = isset( $url_components['path'] ) ? $url_components['path'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $wordcamp = get_post( $wordcamp_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $wordcamp_meta = get_post_custom( $wordcamp_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $lead_organizer = $this->get_user_or_current_user( $wordcamp_meta['WordPress.org Username'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lead_organizer = $this->get_user_or_current_user( $wordcamp_meta['WordPress.org Username'][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_meta = array( 'public' => 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->new_site_id = wpmu_create_blog( $url_components['host'], $path, 'WordCamp Event', $lead_organizer->ID, $site_meta );
</span><span class="cx" style="display: block; padding: 0 10px"> // todo can probably just set the final name here, rather than a generic one here and the final one in set_default_options()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,23 +177,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $wordcamp = get_post( $wordcamp_id );
- $meta = get_post_custom( $wordcamp_id );
- $blog_id = get_wordcamp_site_id( $wordcamp );
- $lead_organizer = $this->get_user_or_current_user( $meta['WordPress.org Username'][0] );
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wordcamp = get_post( $wordcamp_id );
+ $meta = get_post_custom( $wordcamp_id );
+ $blog_id = get_wordcamp_site_id( $wordcamp );
+ $lead_organizer = $this->get_user_or_current_user( $meta['WordPress.org Username'][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $assigned_sponsor_data = $this->get_assigned_sponsor_data( $wordcamp->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sponsors = $this->get_stub_me_sponsors( $assigned_sponsor_data );
- $existing_sponsors = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sponsors = $this->get_stub_me_sponsors( $assigned_sponsor_data );
+ $existing_sponsors = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sponsors_query = get_posts( array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fields' => 'ids',
- 'post_type' => 'wcb_sponsor',
- 'post_status' => 'any',
- 'posts_per_page' => -1,
- 'cache_results' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fields' => 'ids',
+ 'post_type' => 'wcb_sponsor',
+ 'post_status' => 'any',
+ 'posts_per_page' => - 1,
+ 'cache_results' => false,
</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"> update_meta_cache( 'post', $sponsors_query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,13 +261,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Result.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _fix_wc_upload_dir( $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['path'] = str_replace( '/home/wordcamp/public_html/mu/wp-content',
- '/home/wordcamp/public_html/wp-content', $data['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['path'] = str_replace(
+ 'public_html/mu/wp-content',
+ 'public_html/wp-content',
+ $data['path']
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['basedir'] = str_replace( '/home/wordcamp/public_html/mu/wp-content',
- '/home/wordcamp/public_html/wp-content', $data['basedir'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['basedir'] = str_replace(
+ 'public_html/mu/wp-content',
+ 'public_html/wp-content',
+ $data['basedir']
+ );
</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 $data;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $data;
</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">@@ -315,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Set the default options
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $wordcamp
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $meta
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $meta
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function set_default_options( $wordcamp, $meta ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** @var $WCCSP_Settings WCCSP_Settings */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,36 +391,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">- // Save post meta
- if ( ! empty( $page['meta'] ) ) {
- foreach ( $page['meta'] as $key => $value ) {
- update_post_meta( $page_id, $key, $value );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Save post meta
+ if ( ! empty( $page['meta'] ) ) {
+ foreach ( $page['meta'] as $key => $value ) {
+ update_post_meta( $page_id, $key, $value );
</ins><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set featured image
- if ( isset( $page['featured_image'] ) ) {
- $results = media_sideload_image( $page['featured_image'], $page_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set featured image
+ if ( isset( $page['featured_image'] ) ) {
+ $results = media_sideload_image( $page['featured_image'], $page_id );
</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 ( ! is_wp_error( $results ) ) {
- $attachment_id = get_posts( array(
- 'posts_per_page' => 1,
- 'post_type' => 'attachment',
- 'post_parent' => $page_id
- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_wp_error( $results ) ) {
+ $attachment_id = get_posts( array(
+ 'posts_per_page' => 1,
+ 'post_type' => 'attachment',
+ 'post_parent' => $page_id
+ ) );
</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 ( isset( $attachment_id[0]->ID ) ) {
- set_post_thumbnail( $page_id, $attachment_id[0]->ID );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $attachment_id[0]->ID ) ) {
+ set_post_thumbnail( $page_id, $attachment_id[0]->ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Assign sponsorship level
- if ( 'wcb_sponsor' == $page['type'] && isset( $page['term'] ) ) {
- wp_set_object_terms( $page_id, $page['term'], 'wcb_sponsor_level', true );
- }
-
- // todo realign
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assign sponsorship level
+ if ( 'wcb_sponsor' == $page['type'] && isset( $page['term'] ) ) {
+ wp_set_object_terms( $page_id, $page['term'], 'wcb_sponsor_level', true );
+ }
</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"> add_action( 'save_post', array( $GLOBALS['wordcamp_admin'], 'metabox_save' ) ); // restore wordcamp meta callback
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -700,7 +709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $assigned_sponsors
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function create_sponsorship_levels( $assigned_sponsors ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $assigned_sponsors as $sponsorship_level_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $assigned_sponsors as $sponsorship_level_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sponsorship_level = $sponsorship_level_id[0]->sponsorship_level;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_insert_term(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +727,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * These are just the multi-event sponsors. Each camp will also have local sponsors, but they'll add those manually.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $assigned_sponsor_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $assigned_sponsor_data
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -781,11 +790,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( BLOG_ID_CURRENT_SITE ); // central.wordcamp.org
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['featured_images'] = array();
- $data['assigned_sponsors'] = $multi_event_sponsors->get_wordcamp_me_sponsors( $wordcamp_id, 'sponsor_level' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['featured_images'] = array();
+ $data['assigned_sponsors'] = $multi_event_sponsors->get_wordcamp_me_sponsors( $wordcamp_id, 'sponsor_level' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $data['assigned_sponsors'] as $sponsorship_level_id => $sponsors ) {
- foreach( $sponsors as $sponsor ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $data['assigned_sponsors'] as $sponsorship_level_id => $sponsors ) {
+ foreach ( $sponsors as $sponsor ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $attachment_id = get_post_thumbnail_id( $sponsor->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,7 +818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The MES_Sponsorship_Level post excerpts contain the intro text for these messages, and the MES_Sponsor
</span><span class="cx" style="display: block; padding: 0 10px"> * post excerpts contain the blurb for each sponsor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param array $assigned_sponsor_data
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $assigned_sponsor_data
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre>
</div>
</div>
</body>
</html>