<!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>[8706] sites/trunk/wordcamp.org/public_html/wp-content: WordCamp: Apply coding standards.</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 { white-space: pre-line; 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/8706">8706</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/8706","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>2019-04-29 20:51:25 +0000 (Mon, 29 Apr 2019)</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: Apply coding standards.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0errorhandlingphp">sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-error-handling.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentmuplugins0errorhandlingphp"></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/mu-plugins/0-error-handling.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/mu-plugins/0-error-handling.php 2019-04-29 20:51:21 UTC (rev 8705)
+++ sites/trunk/wordcamp.org/public_html/wp-content/mu-plugins/0-error-handling.php 2019-04-29 20:51:25 UTC (rev 8706)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordCamp\Error_Handling;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-defined( 'WPINC' ) or die();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+defined( 'WPINC' ) || die();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> use DirectoryIterator;
</span><span class="cx" style="display: block; padding: 0 10px"> use Dotorg\Slack\Send;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</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"> // Checks to see if the error-throwing expression is prepended with the @ control operator.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // See https://secure.php.net/manual/en/function.set-error-handler.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See https://secure.php.net/manual/en/function.set-error-handler.php.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === error_reporting() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * already exists in the constant itself, because double-slashes will prevent the string from matching.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $error_ignorelist = [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // See https://core.trac.wordpress.org/ticket/29204
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See https://core.trac.wordpress.org/ticket/29204.
</ins><span class="cx" style="display: block; padding: 0 10px"> ABSPATH . 'wp-includes/SimplePie/Registry.php:215' => 'Non-static method WP_Feed_Cache::create() should not be called statically',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is normal.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,17 +70,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WP_PLUGIN_DIR . '/hyperdb/db.php:1230' => 'mysqli_query(): MySQL server has gone away',
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These are trivial mistakes in 3rd party code. They indicate poor quality, but don't warrant action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ABSPATH . 'wp-includes/class-wp-post.php:342' => 'Undefined property: WP_Post::$filter',
- ABSPATH . 'wp-includes/class-wp-query.php:3918' => "Trying to get property 'ID' of non-object",
- ABSPATH . 'wp-includes/class-wp-query.php:3920' => "Trying to get property 'post_title' of non-object",
- ABSPATH . 'wp-includes/class-wp-query.php:3922' => "Trying to get property 'post_name' of non-object",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ABSPATH . 'wp-includes/class-wp-post.php:342' => 'Undefined property: WP_Post::$filter',
+ ABSPATH . 'wp-includes/class-wp-query.php:3918' => "Trying to get property 'ID' of non-object",
+ ABSPATH . 'wp-includes/class-wp-query.php:3920' => "Trying to get property 'post_title' of non-object",
+ ABSPATH . 'wp-includes/class-wp-query.php:3922' => "Trying to get property 'post_name' of non-object",
</ins><span class="cx" style="display: block; padding: 0 10px"> ABSPATH . 'wp-includes/comment-template.php:1221' => "Trying to get property 'comment_status' of non-object",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ABSPATH . 'wp-includes/link-template.php:675' => "Trying to get property 'post_type' of non-object",
- ABSPATH . 'wp-includes/rss.php:352' => 'Undefined index: description',
- ABSPATH . 'wp-includes/rss.php:505' => 'Undefined property: stdClass::$error',
- WP_PLUGIN_DIR . '/camptix-paystack/includes/class-paystack.php:337' => 'Undefined variable: txn',
- WP_PLUGIN_DIR . '/jetpack/_inc/lib/class.media-summary.php:118' => 'Undefined index: id',
- WP_PLUGIN_DIR . '/jetpack/_inc/lib/class.media-summary.php:119' => 'Undefined index: id',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ABSPATH . 'wp-includes/link-template.php:675' => "Trying to get property 'post_type' of non-object",
+ ABSPATH . 'wp-includes/rss.php:352' => 'Undefined index: description',
+ ABSPATH . 'wp-includes/rss.php:505' => 'Undefined property: stdClass::$error',
+
+ WP_PLUGIN_DIR . '/camptix-paystack/includes/class-paystack.php:337' => 'Undefined variable: txn',
+ WP_PLUGIN_DIR . '/jetpack/_inc/lib/class.media-summary.php:118' => 'Undefined index: id',
+ WP_PLUGIN_DIR . '/jetpack/_inc/lib/class.media-summary.php:119' => 'Undefined index: id',
</ins><span class="cx" style="display: block; padding: 0 10px"> WP_PLUGIN_DIR . '/jetpack/sync/class.jetpack-sync-module-posts.php:151' => "Trying to get property 'post_type' of non-object",
</span><span class="cx" style="display: block; padding: 0 10px"> WP_PLUGIN_DIR . '/jetpack/sync/class.jetpack-sync-module-posts.php:137' => 'Undefined offset:',
</span><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,12 +91,13 @@
</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"> $err_key = substr( base64_encode("$file-$line-$err_no" ), -254 ); // Max file length for ubuntu is 255.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $send_message = false;
+ $occurrences = 0;
+
+ $data = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'last_reported_at' => time(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_count' => 0, // Since last reported.
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $send_message = false;
- $occurrences = 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( error_record_exists( $err_key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = get_error_record( $err_key );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function catch_fatal() {
</span><span class="cx" style="display: block; padding: 0 10px"> $error = error_get_last();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // See https://secure.php.net/manual/en/function.set-error-handler.php
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // See https://secure.php.net/manual/en/function.set-error-handler.php.
</ins><span class="cx" style="display: block; padding: 0 10px"> $unhandled_error_types = [ E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $error ) && in_array( $error['type'], $unhandled_error_types, true ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,8 +198,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function send_error_to_slack( $err_no, $err_msg, $file, $line, $occurrences = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'WORDCAMP_ENVIRONMENT' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || ( 'production' !== WORDCAMP_ENVIRONMENT && ! defined( 'SANDBOX_SLACK_USERNAME' ) )
- || ! is_readable( __DIR__ . '/includes/slack/send.php' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || ( 'production' !== WORDCAMP_ENVIRONMENT && ! defined( 'SANDBOX_SLACK_USERNAME' ) )
+ || ! is_readable( __DIR__ . '/includes/slack/send.php' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,11 +218,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $footer .= "Occurred *$occurrences time(s)* since last reported";
</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">- switch( $err_no ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ switch ( $err_no ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> case E_ERROR:
</span><span class="cx" style="display: block; padding: 0 10px"> case E_PARSE:
</span><span class="cx" style="display: block; padding: 0 10px"> case E_CORE_ERROR:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case E_COMPILE_ERROR :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case E_COMPILE_ERROR:
</ins><span class="cx" style="display: block; padding: 0 10px"> case E_USER_ERROR:
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> $color = '#ff0000'; // Red.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => 'Stack Trace',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => $stack_trace,
</span><span class="cx" style="display: block; padding: 0 10px"> 'short' => false,
</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"> ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment = array(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp"></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-forms-to-drafts/wordcamp-forms-to-drafts.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-forms-to-drafts/wordcamp-forms-to-drafts.php 2019-04-29 20:51:21 UTC (rev 8705)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php 2019-04-29 20:51:25 UTC (rev 8706)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -325,9 +325,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $current_user;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $all_values = $this->get_unprefixed_grunion_form_values( $all_values );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $all_values = $this->get_unprefixed_grunion_form_values( $all_values );
+ $speaker_user_id = $this->get_user_id_from_username( $all_values['WordPress.org Username'] );
</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 ( ! $speaker_user_id = $this->get_user_id_from_username( $all_values['WordPress.org Username'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $speaker_user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $speaker_user_id = $current_user->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $all_values['WordPress.org Username'] = $current_user->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>