<!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>[2261] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types: WordCamp Post Types: Add billing information fields to Sponsor post type.</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/2261">2261</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/2261","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-01-08 23:30:10 +0000 (Fri, 08 Jan 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 Types: Add billing information fields to Sponsor post type.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssadmincss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/admin.css</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/</li>
<li>sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/</li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesviewssponsorsmetaboxsponsorinfophp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-info.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypescssadmincss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/admin.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/admin.css       2016-01-08 20:42:19 UTC (rev 2260)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/css/admin.css 2016-01-08 23:30:10 UTC (rev 2261)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,4 +16,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> #dashboard_right_now a.wcb_sponsor-count:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #dashboard_right_now span.wcb_sponsor-count:before {
</span><span class="cx" style="display: block; padding: 0 10px">        content: "\f487";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-}
</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-form {
+       display: table;
+}
+
+       .wcpt-form li {
+               display: table-row;
+       }
+
+               .wcpt-form li label {
+                       display: table-cell;
+               }
+
+               .wcpt-form li input,
+               .wcpt-form li select {
+                       display: table-cell;
+                       margin-left: 1em;
+               }
+
+               li.wcpt-form-header {
+                       display: table-caption;
+                       font-weight: bold;
+               }
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypesviewssponsorsmetaboxsponsorinfophp"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-info.php                             (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/views/sponsors/metabox-sponsor-info.php       2016-01-08 23:30:10 UTC (rev 2261)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,193 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<ul class="wcpt-form">
+       <li class="wcpt-form-header">
+               <?php _e( 'Contact Information', 'wordcamporg' ); ?>
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_company_name">
+                       <?php _e( 'Company Name:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_company_name"
+                       name="_wcpt_sponsor_company_name"
+                       value="<?php echo esc_attr( $company_name ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_website">
+                       <?php _e( 'Website:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="url"
+                       class="regular-text"
+                       id="_wcpt_sponsor_website"
+                       name="_wcpt_sponsor_website"
+                       value="<?php echo esc_url( $website ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_first_name">
+                       <?php _e( 'First Name:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_first_name"
+                       name="_wcpt_sponsor_first_name"
+                       value="<?php echo esc_attr( $first_name ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_last_name">
+                       <?php _e( 'Last Name:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_last_name"
+                       name="_wcpt_sponsor_last_name"
+                       value="<?php echo esc_attr( $last_name ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_email_address">
+                       <?php _e( 'Email Address:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_email_address"
+                       name="_wcpt_sponsor_email_address"
+                       value="<?php echo esc_attr( $email_address ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_phone_number">
+                       <?php _e( 'Phone Number:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_phone_number"
+                       name="_wcpt_sponsor_phone_number"
+                       value="<?php echo esc_attr( $phone_number ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_tax_resale_number">
+                       <?php _e( 'Tax Resale Number:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_tax_resale_number"
+                       name="_wcpt_sponsor_tax_resale_number"
+                       value="<?php echo esc_attr( $tax_resale_number ); ?>"
+               />
+       </li>
+</ul>
+
+<ul class="wcpt-form">
+       <li class="wcpt-form-header">
+               <?php _e( 'Address', 'wordcamporg' ); ?>
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_street_address1">
+                       <?php _e( 'Street Address 1:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_street_address1"
+                       name="_wcpt_sponsor_street_address1"
+                       value="<?php echo esc_attr( $street_address1 ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_street_address2">
+                       <?php _e( 'Street Address 2:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_street_address2"
+                       name="_wcpt_sponsor_street_address2"
+                       value="<?php echo esc_attr( $street_address2 ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_city">
+                       <?php _e( 'City:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_city"
+                       name="_wcpt_sponsor_city"
+                       value="<?php echo esc_attr( $city ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_state">
+                       <?php _e( 'State / Province:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_state"
+                       name="_wcpt_sponsor_state"
+                       value="<?php echo esc_attr( $state ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_zip_code">
+                       <?php _e( 'ZIP / Postal Code:', 'wordcamporg' ); ?>
+               </label>
+
+               <input
+                       type="text"
+                       class="regular-text"
+                       id="_wcpt_sponsor_zip_code"
+                       name="_wcpt_sponsor_zip_code"
+                       value="<?php echo esc_attr( $zip_code ); ?>"
+               />
+       </li>
+
+       <li>
+               <label for="_wcpt_sponsor_country">
+                       <?php _e( 'Country:', 'wordcamporg' ) ?>
+               </label>
+
+               <select id="_wcpt_sponsor_country" name="_wcpt_sponsor_country">
+                       <?php foreach ( $available_countries as $available_country ) : ?>
+                               <option value="<?php echo esc_attr( $available_country ); ?>" <?php selected( $available_country, $country ); ?>>
+                                       <?php echo esc_html( $available_country ); ?>
+                               </option>
+                       <?php endforeach; ?>
+               </select>
+       </li>
+</ul>
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswcposttypeswcposttypesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php   2016-01-08 20:42:19 UTC (rev 2260)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php     2016-01-08 23:30:10 UTC (rev 2261)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,6 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'edit-wcb_speaker':
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'edit-wcb_sponsor':
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'edit-wcb_session':
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        case 'wcb_sponsor':
</ins><span class="cx" style="display: block; padding: 0 10px">                         case 'dashboard':
</span><span class="cx" style="display: block; padding: 0 10px">                                wp_enqueue_style( 'wcpt-admin', plugins_url( '/css/admin.css', __FILE__ ), array(), 1 );
</span><span class="cx" style="display: block; padding: 0 10px">                                break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1308,7 +1309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_meta_box( 'organizer-info', __( 'Organizer Info', 'wordcamporg'  ), array( $this, 'metabox_organizer_info' ), 'wcb_organizer', 'side' );
</span><span class="cx" style="display: block; padding: 0 10px">                add_meta_box( 'speakers-list',  __( 'Speakers',       'wordcamporg'  ), array( $this, 'metabox_speakers_list'  ), 'wcb_session',   'side' );
</span><span class="cx" style="display: block; padding: 0 10px">                add_meta_box( 'session-info',   __( 'Session Info',   'wordcamporg'  ), array( $this, 'metabox_session_info'   ), 'wcb_session',   'normal' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_meta_box( 'sponsor-info',   __( 'Sponsor Info',   'wordcampbase' ), array( $this, 'metabox_sponsor_info'   ), 'wcb_sponsor',   'side' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_meta_box( 'sponsor-info',   __( 'Sponsor Info',   'wordcamporg'  ), array( $this, 'metabox_sponsor_info'   ), 'wcb_sponsor',   'normal' );
</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">@@ -1501,19 +1502,43 @@
</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">         * Render the Sponsor Info metabox view
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         *
+        * @param WP_Post $sponsor
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        function metabox_sponsor_info( $sponsor ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $website = get_post_meta( $sponsor->ID, '_wcpt_sponsor_website', true );
-               wp_nonce_field( 'edit-sponsor-info', 'wcpt-meta-sponsor-info' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $company_name      = get_post_meta( $sponsor->ID, '_wcpt_sponsor_company_name',      true );
+               $website           = get_post_meta( $sponsor->ID, '_wcpt_sponsor_website',           true );
+               $first_name        = get_post_meta( $sponsor->ID, '_wcpt_sponsor_first_name',        true );
+               $last_name         = get_post_meta( $sponsor->ID, '_wcpt_sponsor_last_name',         true );
+               $email_address     = get_post_meta( $sponsor->ID, '_wcpt_sponsor_email_address',     true );
+               $phone_number      = get_post_meta( $sponsor->ID, '_wcpt_sponsor_phone_number',      true );
+               $tax_resale_number = get_post_meta( $sponsor->ID, '_wcpt_sponsor_tax_resale_number', 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">-                ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $street_address1 = get_post_meta( $sponsor->ID, '_wcpt_sponsor_street_address1',   true );
+               $street_address2 = get_post_meta( $sponsor->ID, '_wcpt_sponsor_street_address2',   true );
+               $city            = get_post_meta( $sponsor->ID, '_wcpt_sponsor_city',              true );
+               $state           = get_post_meta( $sponsor->ID, '_wcpt_sponsor_state',             true );
+               $zip_code        = get_post_meta( $sponsor->ID, '_wcpt_sponsor_zip_code',          true );
+               $country         = get_post_meta( $sponsor->ID, '_wcpt_sponsor_country',           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">-                <p>
-                       <label for="_wcpt_sponsor_website"><?php _e( 'Website:', 'wordcampbase' ); ?></label>
-                       <input type="text" class="widefat" id="_wcpt_sponsor_website" name="_wcpt_sponsor_website" value="<?php echo esc_attr( esc_url( $website ) ); ?>" />
-               </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $available_countries = array( 'Abkhazia', 'Afghanistan', 'Aland', 'Albania', 'Algeria', 'American Samoa', 'Andorra', 'Angola', 'Anguilla', 'Antigua and Barbuda', 'Argentina', 'Armenia', 'Aruba', 'Ascension', 'Ashmore and Cartier Islands', 'Australia', 'Australian Antarctic Territory', 'Austria', 'Azerbaijan', 'Bahamas, The', 'Bahrain', 'Baker Island', 'Bangladesh', 'Barbados', 'Belarus', 'Belgium', 'Belize', 'Benin', 'Bermuda', 'Bhutan', 'Bolivia', 'Bosnia and Herzegovina', 'Botswana', 'Bouvet Island', 'Brazil', 'British Antarctic Territory', 'British Indian Ocean Territory', 'British Sovereign Base Areas', 'British Virgin Islands', 'Brunei', 'Bulgaria', 'Burkina Faso', 'Burundi', 'Cambodia', 'Cameroon', 'Canada', 'Cape Verde', 'Cayman Islands', 'Central African Republic', 'Chad', 'Chile', "China, People's Republic of", 'China, Republic of (Taiwan)', 'Christmas Island', 'Clipp
 erton Island', 'Cocos (Keeling) Islands', 'Colombia', 'Comoros', 'Congo, (Congo – Brazzaville)', 'Congo, (Congo – Kinshasa)', 'Cook Islands', 'Coral Sea Islands', 'Costa Rica', "Cote d'Ivoire (Ivory Coast)", 'Croatia', 'Cuba', 'Cyprus', 'Czech Republic', 'Denmark', 'Djibouti', 'Dominica', 'Dominican Republic', 'Ecuador', 'Egypt', 'El Salvador', 'Equatorial Guinea', 'Eritrea', 'Estonia', 'Ethiopia', 'Falkland Islands (Islas Malvinas)', 'Faroe Islands', 'Fiji', 'Finland', 'France', 'French Guiana', 'French Polynesia', 'French Southern and Antarctic Lands', 'Gabon', 'Gambia, The', 'Georgia', 'Germany', 'Ghana', 'Gibraltar', 'Greece', 'Greenland', 'Grenada', 'Guadeloupe', 'Guam', 'Guatemala', 'Guernsey', 'Guinea', 'Guinea-Bissau', 'Guyana', 'Haiti', 'Heard Island and McDonald Islands', 'Honduras', 'Hong Kong', 'Howland Island', 'Hungary', 'Iceland', 'India', 'Indonesia', 'Iran', 'Iraq', 'Ireland', 'Isle of Man', 'Israel', 'Italy', 'Jamaica', 'Japan', 'Jarvis Island', 'Jersey
 ', 'Johnston Atoll', 'Jordan', 'Kazakhstan', 'Kenya', 'Kingman Reef', 'Kiribati', 'Korea, North', 'Korea, South', 'Kuwait', 'Kyrgyzstan', 'Laos', 'Latvia', 'Lebanon', 'Lesotho', 'Liberia', 'Libya', 'Liechtenstein', 'Lithuania', 'Luxembourg', 'Macau', 'Macedonia', 'Madagascar', 'Malawi', 'Malaysia', 'Maldives', 'Mali', 'Malta', 'Marshall Islands', 'Martinique', 'Mauritania', 'Mauritius', 'Mayotte', 'Mexico', 'Micronesia', 'Midway Islands', 'Moldova', 'Monaco', 'Mongolia', 'Montenegro', 'Montserrat', 'Morocco', 'Mozambique', 'Myanmar (Burma)', 'Nagorno-Karabakh', 'Namibia', 'Nauru', 'Navassa Island', 'Nepal', 'Netherlands', 'Netherlands Antilles', 'New Caledonia', 'New Zealand', 'Nicaragua', 'Niger', 'Nigeria', 'Niue', 'Norfolk Island', 'Northern Cyprus', 'Northern Mariana Islands', 'Norway', 'Oman', 'Pakistan', 'Palau', 'Palmyra Atoll', 'Panama', 'Papua New Guinea', 'Paraguay', 'Peru', 'Peter I Island', 'Philippines', 'Pitcairn Islands', 'Poland', 'Portugal', 'Pridnestrovie (Transnis
 tria)', 'Puerto Rico', 'Qatar', 'Queen Maud Land', 'Reunion', 'Romania', 'Ross Dependency', 'Russia', 'Rwanda', 'Saint Barthelemy', 'Saint Helena', 'Saint Kitts and Nevis', 'Saint Lucia', 'Saint Martin', 'Saint Pierre and Miquelon', 'Saint Vincent and the Grenadines', 'Samoa', 'San Marino', 'Sao Tome and Principe', 'Saudi Arabia', 'Senegal', 'Serbia', 'Seychelles', 'Sierra Leone', 'Singapore', 'Slovakia', 'Slovenia', 'Solomon Islands', 'Somalia', 'Somaliland', 'South Africa', 'South Georgia & South Sandwich Islands', 'South Ossetia', 'Spain', 'Sri Lanka', 'Sudan', 'Suriname', 'Svalbard', 'Swaziland', 'Sweden', 'Switzerland', 'Syria', 'Tajikistan', 'Tanzania', 'Thailand', 'Timor-Leste (East Timor)', 'Togo', 'Tokelau', 'Tonga', 'Trinidad and Tobago', 'Tristan da Cunha', 'Tunisia', 'Turkey', 'Turkmenistan', 'Turks and Caicos Islands', 'Tuvalu', 'U.S. Virgin Islands', 'Uganda', 'Ukraine', 'United Arab Emirates', 'United Kingdom', 'United States', 'Uruguay', 'Uzbekistan', 'Vanuatu', 
 'Vatican City', 'Venezuela', 'Vietnam', 'Wake Island', 'Wallis and Futuna', 'Yemen', 'Zambia', 'Zimbabwe' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         /*
+                * In most cases, the company name will be the same as the post title, but sometimes companies sponsor
+                * under specific brands (e.g., Automattic as Jetpack), so we want to pre-populate the field to avoid
+                * making the user do unnecessary work.
+                */
+               if ( empty( $company_name ) ) {
+                       $company_name = $sponsor->post_title;
+               }
+
+               if ( empty( $country ) ) {
+                       $country = 'United States';
+               }
+
+               wp_nonce_field( 'edit-sponsor-info', 'wcpt-meta-sponsor-info' );
+
+               require_once( __DIR__ . '/views/sponsors/metabox-sponsor-info.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">@@ -1677,14 +1702,24 @@
</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 ( isset( $_POST['wcpt-meta-sponsor-info'] ) && wp_verify_nonce( $_POST['wcpt-meta-sponsor-info'], 'edit-sponsor-info' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $website = esc_url_raw( $_POST['_wcpt_sponsor_website'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $text_values = array(
+                               'company_name', 'first_name', 'last_name', 'email_address', 'phone_number', 'tax_resale_number',
+                               'street_address1', 'street_address2', 'city', 'state', 'zip_code', 'country'
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        foreach ( $text_values as $id ) {
+                               $values[ $id ] = sanitize_text_field( $_POST["_wcpt_sponsor_$id"] );
+                       }
+
+                       $values['website'] = esc_url_raw( $_POST['_wcpt_sponsor_website'] );
</ins><span class="cx" style="display: block; padding: 0 10px">                         // TODO: maybe only allows links to home page, depending on outcome of http://make.wordpress.org/community/2013/12/31/irs-rules-for-corporate-sponsorship-of-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">-                        if ( $website ) {
-                               update_post_meta( $post_id, '_wcpt_sponsor_website', $website );
-                       } else {
-                               delete_post_meta( $post_id, '_wcpt_sponsor_website' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 foreach( $values as $id => $value ) {
+                               if ( empty( $value ) ) {
+                                       delete_post_meta( $post_id, "_wcpt_sponsor_$id" );
+                               } else {
+                                       update_post_meta( $post_id, "_wcpt_sponsor_$id", $value );
+                               }
</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>
</div>

</body>
</html>