<!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>[2701] sites/trunk/wordcamp.org/public_html/wp-content/plugins: WordCamp Budgets: Remove redundant country fields.</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/2701">2701</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/2701","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-03-07 23:34:12 +0000 (Mon, 07 Mar 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 Budgets: Remove redundant country fields.
ISO 3166-compliant country fields were added in <a href="http://meta.trac.wordpress.org/changeset/2420">r2420</a>, and these old ones should have been removed then.
We don't need to worry about back-compat because there aren't any current requests that are missing the new fields, and the data for the old fields is still in the database if we ever need it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></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/wordcamp-payments/includes/payment-request.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/wordcamp-payments/includes/payment-request.php 2016-03-07 23:24:32 UTC (rev 2700)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2016-03-07 23:34:12 UTC (rev 2701)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,7 +751,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'vendor_city':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'vendor_state':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'vendor_zip_code':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'vendor_country':
</del><span class="cx" style="display: block; padding: 0 10px"> case 'vendor_contact_person':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'other_category_explanation':
</span><span class="cx" style="display: block; padding: 0 10px"> $safe_value = sanitize_text_field( $unsafe_value );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></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/wordcamp-payments/includes/wordcamp-budgets.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/wordcamp-payments/includes/wordcamp-budgets.php 2016-03-07 23:24:32 UTC (rev 2700)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2016-03-07 23:34:12 UTC (rev 2701)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -440,6 +440,26 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a country name from an alpha-2 or alpha-3 code
+ *
+ * @param string $country_code
+ *
+ * @return string
+ */
+ public static function get_country_name( $country_code ) {
+ $countries = self::get_valid_countries_iso3166();
+ $name = '';
+
+ foreach ( $countries as $country ) {
+ if ( $country_code === $country['alpha2'] || $country_code === $country['alpha3'] ) {
+ $name = $country['name'];
+ }
+ }
+
+ return $name;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Get a list of valid payment methods
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param $post_type
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +492,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'bank_city':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'bank_state':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'bank_zip_code':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'bank_country':
</del><span class="cx" style="display: block; padding: 0 10px"> case 'bank_bic':
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'interm_bank_name':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +508,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'beneficiary_city':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'beneficiary_state':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'beneficiary_zip_code':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'beneficiary_country':
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'payable_to':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'check_street_address':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +592,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'beneficiary_city',
</span><span class="cx" style="display: block; padding: 0 10px"> 'beneficiary_state',
</span><span class="cx" style="display: block; padding: 0 10px"> 'beneficiary_zip_code',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'beneficiary_country',
</del><span class="cx" style="display: block; padding: 0 10px"> 'beneficiary_country_iso3166',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ach_bank_name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'ach_routing_number',
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp"></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/wordcamp-payments/views/payment-request/metabox-payment.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/wordcamp-payments/views/payment-request/metabox-payment.php 2016-03-07 23:24:32 UTC (rev 2700)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php 2016-03-07 23:34:12 UTC (rev 2701)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,8 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s Bank City', 'bank_city' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s Bank State / Province', 'bank_state' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s Bank ZIP / Postal Code', 'bank_zip_code' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Beneficiary’s Bank Country', 'bank_country' ); ?>
- <?php $this->render_country_input( $post, 'Beneficiary’s Bank Country ISO 3166', 'bank_country_iso3166' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_country_input( $post, 'Beneficiary’s Bank Country', 'bank_country_iso3166' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s Bank SWIFT BIC', 'bank_bic' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s Account Number or IBAN', 'beneficiary_account_number' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,8 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s City', 'beneficiary_city' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s State / Province', 'beneficiary_state' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_text_input( $post, 'Beneficiary’s ZIP / Postal Code', 'beneficiary_zip_code' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Beneficiary’s Country', 'beneficiary_country' ); ?>
- <?php $this->render_country_input( $post, 'Beneficiary’s Country ISO 3166', 'beneficiary_country_iso3166' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_country_input( $post, 'Beneficiary’s Country', 'beneficiary_country_iso3166' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp"></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/wordcamp-payments/views/payment-request/metabox-vendor.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/wordcamp-payments/views/payment-request/metabox-vendor.php 2016-03-07 23:24:32 UTC (rev 2700)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php 2016-03-07 23:34:12 UTC (rev 2701)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,8 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input( $post, 'City', 'vendor_city' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input( $post, 'State / Province', 'vendor_state' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input( $post, 'ZIP / Postal Code', 'vendor_zip_code' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->render_text_input( $post, 'Country', 'vendor_country' );
- $this->render_country_input( $post, 'Country ISO3166', 'vendor_country_iso3166' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->render_country_input( $post, 'Country', 'vendor_country_iso3166' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsnetworkincludeswordcampbudgetsdashboardphp"></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/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.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/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-03-07 23:24:32 UTC (rev 2700)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments-network/includes/wordcamp-budgets-dashboard.php 2016-03-07 23:34:12 UTC (rev 2701)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -363,6 +363,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $category = '';
</span><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">+ $country_name = \WordCamp_Budgets::get_country_name(
+ get_post_meta( $index->post_id, '_camppayments_vendor_country_iso3166', true )
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $row = array(
</span><span class="cx" style="display: block; padding: 0 10px"> get_wordcamp_name(),
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf( '%d-%d', $index->blog_id, $index->post_id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +381,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $index->post_id, '_camppayments_payment_method', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $index->post_id, '_camppayments_vendor_name', true ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $index->post_id, '_camppayments_vendor_contact_person', true ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- get_post_meta( $index->post_id, '_camppayments_vendor_country', true ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $country_name,
</ins><span class="cx" style="display: block; padding: 0 10px"> \WCP_Encryption::maybe_decrypt( get_post_meta( $index->post_id, '_camppayments_payable_to', true ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_edit_post_link( $index->post_id ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $index->post_id, '_camppayments_file_notes', true ),
</span></span></pre>
</div>
</div>
</body>
</html>