<!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>[7173] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page: WordCamp Coming Soon Page: 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/7173">7173</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/7173","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>2018-04-26 22:18:32 +0000 (Thu, 26 Apr 2018)</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 Coming Soon Page: Apply coding standards.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpagebootstrapphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/bootstrap.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspsettingsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpagecsstemplatecomingsoondynamicphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/css/template-coming-soon-dynamic.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewssettingsadminnoticesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/settings-admin-notices.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewstemplatecomingsoonphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpagebootstrapphp"></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-coming-soon-page/bootstrap.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-coming-soon-page/bootstrap.php   2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/bootstrap.php     2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,4 +1,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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><span class="cx" style="display: block; padding: 0 10px"> Plugin Name: WordCamp Coming Soon Page
</span><span class="cx" style="display: block; padding: 0 10px"> Description: Creates a Coming Soon landing page for new WordCamp sites
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp"></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-coming-soon-page/classes/wccsp-customizer.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-coming-soon-page/classes/wccsp-customizer.php    2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php      2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Constructor
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'init',                  array( $this, 'init'                           ), 11 ); // after WCCSP_Settings::init()
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_action( 'init',                  array( $this, 'init'                           ), 11 ); // After WCCSP_Settings::init().
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'customize_register',    array( $this, 'register_customizer_components' )     );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_customizer_scripts'     )     );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,13 +28,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->add_section(
</span><span class="cx" style="display: block; padding: 0 10px">                        'wccsp_live_preview',
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'capability' => $GLOBALS['WCCSP_Settings']::REQUIRED_CAPABILITY,
-                               'title'      => __( 'Coming Soon Page', 'wordcamporg' ),
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'capability'  => $GLOBALS['WCCSP_Settings']::REQUIRED_CAPABILITY,
+                               'title'       => __( 'Coming Soon Page', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                                 'description' => __(
</span><span class="cx" style="display: block; padding: 0 10px">                                        'When enabled, the Coming Soon page will be displayed to logged-out users, giving you a chance to setup all of your content before your site is visible to the world.',
</span><span class="cx" style="display: block; padding: 0 10px">                                        'wordcamporg'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                ) . $GLOBALS['WCCSP_Settings']->render_admin_notices(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ) . $GLOBALS['WCCSP_Settings']->render_admin_notices(),
</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">@@ -51,11 +50,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $wp_customize->add_control(
</span><span class="cx" style="display: block; padding: 0 10px">                        'wccsp_settings[enabled]',
</span><span class="cx" style="display: block; padding: 0 10px">                        array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'section'     => 'wccsp_live_preview',
-                               'type'        => 'radio',
-                               'choices'     => array( 'on' => 'On', 'off' => 'Off' ),
-                               'priority'    => 1,
-                               'capability'  => $GLOBALS['WCCSP_Settings']::REQUIRED_CAPABILITY,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'section'    => 'wccsp_live_preview',
+                               'type'       => 'radio',
+                               'choices'    => array( 'on' => 'On', 'off' => 'Off' ),
+                               'priority'   => 1,
+                               'capability' => $GLOBALS['WCCSP_Settings']::REQUIRED_CAPABILITY,
</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>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspsettingsphp"></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-coming-soon-page/classes/wccsp-settings.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-coming-soon-page/classes/wccsp-settings.php      2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php        2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">        const REQUIRED_CAPABILITY = 'administrator';
</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">-         * Constructor
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Constructor.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'admin_menu',                   array( $this, 'register_settings_pages' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,18 +27,18 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Retrieves all of the settings from the database
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Retrieves all of the settings from the database.
</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="cx" style="display: block; padding: 0 10px">        public function get_settings() {
</span><span class="cx" style="display: block; padding: 0 10px">                $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'enabled'                    => 'off',        // so that sites created before the plugin was deployed won't display the home page when the plugin is activated
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'enabled'                    => 'off',        // So that sites created before the plugin was deployed won't display the home page when the plugin is activated.
</ins><span class="cx" style="display: block; padding: 0 10px">                         'body_background_color'      => '#0073AA',
</span><span class="cx" style="display: block; padding: 0 10px">                        'image_id'                   => 0,
</span><span class="cx" style="display: block; padding: 0 10px">                        'background_id'              => 0,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        'container_background_color' => '#FFFFFF', // deprecated
-                       'text_color'                 => '#000000', // deprecated
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 'container_background_color' => '#FFFFFF', // Deprecated.
+                       'text_color'                 => '#000000', // Deprecated.
</ins><span class="cx" style="display: block; padding: 0 10px">                         'introduction'               => '',
</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">@@ -51,7 +51,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">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Add a link to the Settings menu
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Add a link to the Settings menu.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * Even though this lives in the Customizer, having a link in the regular admin menus helps with
</span><span class="cx" style="display: block; padding: 0 10px">         * discoverability.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,8 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Clear the static page cache
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Clear the static page cache.
+        *
</ins><span class="cx" style="display: block; padding: 0 10px">          * Changing the settings will change the how the page looks, so the cache needs to be refreshed.
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function clear_static_page_cache() {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp"></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-coming-soon-page/classes/wordcamp-coming-soon-page.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-coming-soon-page/classes/wordcamp-coming-soon-page.php   2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php     2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,16 +8,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Constructor
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_action( 'init',                       array( $this, 'init' ), 11 );                               // after WCCSP_Settings::init()
-               add_action( 'wp_enqueue_scripts',         array( $this, 'manage_plugin_theme_stylesheets' ), 99 );    // (hopefully) after all plugins/themes have enqueued their styles
-               add_action( 'wp_head',                    array( $this, 'render_dynamic_styles' ) );
-               add_filter( 'template_include',           array( $this, 'override_theme_template' ) );
-               add_action( 'template_redirect',          array( $this, 'disable_jetpacks_open_graph' ) );
-               add_filter( 'rest_authentication_errors', array( $this, 'disable_rest_endpoints' ) );
-               add_action( 'admin_bar_menu',             array( $this, 'admin_bar_menu_item' ), 1000 );
-               add_action( 'admin_head',                 array( $this, 'admin_bar_styling' ) );
-               add_action( 'wp_head',                    array( $this, 'admin_bar_styling' ) );
-               add_action( 'admin_notices',              array( $this, 'block_new_post_admin_notice' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_action( 'init',                       array( $this, 'init'                            ), 11    );  // After WCCSP_Settings::init().
+               add_action( 'wp_enqueue_scripts',         array( $this, 'manage_plugin_theme_stylesheets' ), 99    );  // (Hopefully) after all plugins/themes have enqueued their styles.
+               add_action( 'wp_head',                    array( $this, 'render_dynamic_styles'           )        );
+               add_filter( 'template_include',           array( $this, 'override_theme_template'         )        );
+               add_action( 'template_redirect',          array( $this, 'disable_jetpacks_open_graph'     )        );
+               add_filter( 'rest_authentication_errors', array( $this, 'disable_rest_endpoints'          )        );
+               add_action( 'admin_bar_menu',             array( $this, 'admin_bar_menu_item'             ), 1000  );
+               add_action( 'admin_head',                 array( $this, 'admin_bar_styling'               )        );
+               add_action( 'wp_head',                    array( $this, 'admin_bar_styling'               )        );
+               add_action( 'admin_notices',              array( $this, 'block_new_post_admin_notice'     )        );
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_filter( 'get_post_metadata',          array( $this, 'jetpack_dont_email_post_to_subs' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                add_image_size( 'wccsp_image_medium_rectangle', 500, 300 );
</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">        public function init() {
</span><span class="cx" style="display: block; padding: 0 10px">                $settings                      = $GLOBALS['WCCSP_Settings']->get_settings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $show_page                     = 'on' == $settings['enabled'] && ! current_user_can( 'edit_posts' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $show_page                     = 'on' === $settings['enabled'] && ! current_user_can( 'edit_posts' );
</ins><span class="cx" style="display: block; padding: 0 10px">                 $this->override_theme_template = $show_page || $this->is_coming_soon_preview();
</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">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * Dequeue all enqueued stylesheets and Custom CSS
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        protected function dequeue_all_stylesheets() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                foreach( $GLOBALS['wp_styles']->queue as $stylesheet ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         foreach ( $GLOBALS['wp_styles']->queue as $stylesheet ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         wp_dequeue_style( $stylesheet );
</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">@@ -140,7 +140,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function get_template_variables() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function get_template_variables() {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $variables = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'image_url'              => $this->get_image_url(),
</span><span class="cx" style="display: block; padding: 0 10px">                        'background_url'         => $this->get_bg_image_url(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,13 +166,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        jetpack_require_lib( 'class.color' );
</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">-                // If they never changed from the old default background color, then use the new default
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // If they never changed from the old default background color, then use the new default.
</ins><span class="cx" style="display: block; padding: 0 10px">                 $background = $settings['body_background_color'];
</span><span class="cx" style="display: block; padding: 0 10px">                if ( '#666666' === $background ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $background = '#0073aa';
</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">-                // Just in case we can't find Jetpack_Color
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Just in case we can't find Jetpack_Color.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( class_exists( 'Jetpack_Color' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $color     = new Jetpack_Color( $background, 'hex' );
</span><span class="cx" style="display: block; padding: 0 10px">                        $color_hsl = $color->toHsl();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,13 +180,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $lighter_color = new Jetpack_Color( array(
</span><span class="cx" style="display: block; padding: 0 10px">                                $color_hsl['h'],
</span><span class="cx" style="display: block; padding: 0 10px">                                $color_hsl['s'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ( $color_hsl['l'] >= 85 ) ? 100 : $color_hsl['l'] + 15
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ( $color_hsl['l'] >= 85 ) ? 100 : $color_hsl['l'] + 15,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ), 'hsl' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        $darker_color = new Jetpack_Color( array(
</span><span class="cx" style="display: block; padding: 0 10px">                                $color_hsl['h'],
</span><span class="cx" style="display: block; padding: 0 10px">                                $color_hsl['s'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                ( $color_hsl['l'] < 10 ) ? 0 : $color_hsl['l'] - 10
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         ( $color_hsl['l'] < 10 ) ? 0 : $color_hsl['l'] - 10,
</ins><span class="cx" style="display: block; padding: 0 10px">                         ), 'hsl' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        $background_lighter = '#' . $lighter_color->toHex();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,7 +200,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['lighter'] = $background_lighter;
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['darker']  = $background_darker;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Not currently customizable
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         // Not currently customizable.
</ins><span class="cx" style="display: block; padding: 0 10px">                 $colors['text']       = '#32373c';
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['light-text'] = '#b4b9be';
</span><span class="cx" style="display: block; padding: 0 10px">                $colors['border']     = '#00669b';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,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">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Retrieve the URL of the logo image displayed in the template
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Retrieve the URL of the logo image displayed in the template.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,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">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Retrieve the URL of the background image displayed in the template
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * Retrieve the URL of the background image displayed in the template.
</ins><span class="cx" style="display: block; padding: 0 10px">          *
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,18 +241,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_dates() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $dates = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $dates         = false;
</ins><span class="cx" style="display: block; padding: 0 10px">                 $wordcamp_post = get_wordcamp_post();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $wordcamp_post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( ! empty( $wordcamp_post->meta['Start Date (YYYY-mm-dd)'][0] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                // translators: date format, see https://php.net/date
-                               $dates = date_i18n( __( 'F jS Y' , 'wordcamporg' ), $wordcamp_post->meta['Start Date (YYYY-mm-dd)'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         // translators: date format, see https://php.net/date.
+                               $dates = date_i18n( __( 'F jS Y', 'wordcamporg' ), $wordcamp_post->meta['Start Date (YYYY-mm-dd)'][0] );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( ! empty( $wordcamp_post->meta['End Date (YYYY-mm-dd)'][0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( $wordcamp_post->meta['Start Date (YYYY-mm-dd)'][0] !== $wordcamp_post->meta['End Date (YYYY-mm-dd)'][0] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                // translators: date format, see https://php.net/date
-                                               $dates .= ' - ' . date_i18n( __( 'F jS Y' , 'wordcamporg' ), $wordcamp_post->meta['End Date (YYYY-mm-dd)'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         // translators: date format, see https://php.net/date.
+                                               $dates .= ' - ' . date_i18n( __( 'F jS Y', 'wordcamporg' ), $wordcamp_post->meta['End Date (YYYY-mm-dd)'][0] );
</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">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @return string
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function get_introduction() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $settings     = $GLOBALS['WCCSP_Settings']->get_settings();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $settings = $GLOBALS['WCCSP_Settings']->get_settings();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                return $settings['introduction'];
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,15 +317,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Display notice in admin bar when Coming Soon mode is on.
</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 WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+  * @param WP_Admin_Bar $wp_admin_bar WP_Admin_Bar instance, passed by reference.
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function admin_bar_menu_item( $wp_admin_bar ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function admin_bar_menu_item( $wp_admin_bar ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $settings = $GLOBALS['WCCSP_Settings']->get_settings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $settings['enabled'] !== 'on' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               if ( 'on' !== $settings['enabled'] ) {
</ins><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">-                $menu_slug   = add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $menu_slug = add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'autofocus[section]' => 'wccsp_live_preview',
</span><span class="cx" style="display: block; padding: 0 10px">                                'url'                => rawurlencode( add_query_arg( 'wccsp-preview', '', site_url() ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function admin_bar_styling() {
</span><span class="cx" style="display: block; padding: 0 10px">                $settings = $GLOBALS['WCCSP_Settings']->get_settings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $settings['enabled'] !== 'on' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               if ( 'on' !== $settings['enabled'] ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php
</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">-        /*
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
</ins><span class="cx" style="display: block; padding: 0 10px">          * Show a notice if Coming Soon is enabled.
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * Explain to users why publishing is disabled when Coming Soon is enabled.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,11 +378,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function block_new_post_admin_notice() {
</span><span class="cx" style="display: block; padding: 0 10px">                $settings = $GLOBALS['WCCSP_Settings']->get_settings();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( $settings['enabled'] !== 'on' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               if ( 'on' !== $settings['enabled'] ) {
</ins><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">-                $menu_slug   = add_query_arg(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $menu_slug = add_query_arg(
</ins><span class="cx" style="display: block; padding: 0 10px">                         array(
</span><span class="cx" style="display: block; padding: 0 10px">                                'autofocus[section]' => 'wccsp_live_preview',
</span><span class="cx" style="display: block; padding: 0 10px">                                'url'                => rawurlencode( add_query_arg( 'wccsp-preview', '', site_url() ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,10 +391,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        '/customize.php'
</span><span class="cx" style="display: block; padding: 0 10px">                );
</span><span class="cx" style="display: block; padding: 0 10px">                $setting_url = admin_url( $menu_slug );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $screen      = get_current_screen();
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $screen = get_current_screen();
-               if ( trim( $screen->id ) == 'post' ) {
-                       $class = 'notice notice-warning';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'post' === trim( $screen->id ) ) {
+                       $class   = 'notice notice-warning';
</ins><span class="cx" style="display: block; padding: 0 10px">                         $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px">                                __( '<a href="%s">Coming Soon mode</a> is enabled. Site subscribers will not receive email notifications about published posts.', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px">                                esc_url( $setting_url )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +404,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $message = wp_strip_all_tags( $message );
</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">-                        printf( '<div class="%1$s"><p>%2$s</p></div>', $class, $message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 printf( '<div class="%1$s"><p>%2$s</p></div>', esc_attr( $class ), wp_kses_data( $message ) );
</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">@@ -413,12 +416,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int               $object_id Object ID.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param string            $meta_key  Meta key.
</span><span class="cx" style="display: block; padding: 0 10px">         * @param bool              $single    Whether to return only the first value of the specified $meta_key.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         *
+        * @return null|array|string
</ins><span class="cx" style="display: block; padding: 0 10px">          */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        function jetpack_dont_email_post_to_subs( $value, $object_id, $meta_key, $single ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function jetpack_dont_email_post_to_subs( $value, $object_id, $meta_key, $single ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( '_jetpack_dont_email_post_to_subs' === $meta_key ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $settings = $GLOBALS['WCCSP_Settings']->get_settings();
</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 ( $settings['enabled'] === 'on' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 if ( 'on' === $settings['enabled'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                 return true;
</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">@@ -426,4 +431,4 @@
</span><span class="cx" style="display: block; padding: 0 10px">                return $value;
</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">-} // end WordCamp_Coming_Soon_Page
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} // end WordCamp_Coming_Soon_Page.
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpagecsstemplatecomingsoondynamicphp"></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-coming-soon-page/css/template-coming-soon-dynamic.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-coming-soon-page/css/template-coming-soon-dynamic.php    2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/css/template-coming-soon-dynamic.php      2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                <?php if ( $background_url ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        background: url('<?php echo esc_url( $background_url ); ?>') no-repeat center;
</span><span class="cx" style="display: block; padding: 0 10px">                        background-size: cover;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                <?php else: ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         <?php else : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         background: <?php echo esc_attr( $colors['main'] ); ?>;
</span><span class="cx" style="display: block; padding: 0 10px">                        background: linear-gradient(
</span><span class="cx" style="display: block; padding: 0 10px">                                45deg,
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewssettingsadminnoticesphp"></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-coming-soon-page/views/settings-admin-notices.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-coming-soon-page/views/settings-admin-notices.php        2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/settings-admin-notices.php  2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2,8 +2,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">        <ul>
</span><span class="cx" style="display: block; padding: 0 10px">                <?php foreach ( $inactive_required_modules as $module ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        <li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php // translators: %s is the name of the jetpack module ?>
-                               <?php printf( __( "Please activate Jetpack's %s module.", 'wordcamporg' ), esc_html( $module ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php // translators: %s is the name of the jetpack module. ?>
+                               <?php printf( esc_html__( "Please activate Jetpack's %s module.", 'wordcamporg' ), esc_html( $module ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </li>
</span><span class="cx" style="display: block; padding: 0 10px">                <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px">        </ul>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewstemplatecomingsoonphp"></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-coming-soon-page/views/template-coming-soon.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-coming-soon-page/views/template-coming-soon.php  2018-04-26 22:18:25 UTC (rev 7172)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php    2018-04-26 22:18:32 UTC (rev 7173)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                                        /* translators: %s is the name of the blog. */
</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">+                                                 esc_html__(
</ins><span class="cx" style="display: block; padding: 0 10px">                                                                 '%s is in the early planning stages. In the meantime, you can subscribe to updates above, or contact the organizers below to get involved.',
</span><span class="cx" style="display: block; padding: 0 10px">                                                                'wordcamporg'
</span><span class="cx" style="display: block; padding: 0 10px">                                                        ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,9 +58,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php if ( in_array( 'contact-form', $active_modules ) && $contact_form_shortcode ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <div class="wccsp-contact">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <h2><?php esc_html_e( 'Contact the Organizers' , 'wordcamporg' ); ?></h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <h2><?php esc_html_e( 'Contact the Organizers', 'wordcamporg' ); ?></h2>
</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 echo $contact_form_shortcode; // intentionally not escaping because it's the output of do_shortcode() ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <?php echo $contact_form_shortcode; // Intentionally not escaping because it's the output of do_shortcode(). ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                                 </div>
</span><span class="cx" style="display: block; padding: 0 10px">                        <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                </div><!-- .wccsp-container -->
</span></span></pre>
</div>
</div>

</body>
</html>