<!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>[2302] 2013/codebykat/post-by-email/trunk: code review fixes that got lost in merge</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">
<dt>Revision</dt> <dd><a href="http://gsoc.trac.wordpress.org/changeset/2302">2302</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-12 22:35:01 +0000 (Thu, 12 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>code review fixes that got lost in merge</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailadminphp">2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php</a></li>
<li><a href="#2013codebykatpostbyemailtrunkclasspostbyemailphp">2013/codebykat/post-by-email/trunk/class-post-by-email.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailadminphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-12 22:19:04 UTC (rev 2301)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email-admin.php 2013-09-12 22:35:01 UTC (rev 2302)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> WP_Screen::get($this->plugin_screen_hook_suffix)->add_help_tab( array(
</span><span class="cx"> 'id' => 'options-postemail',
</span><span class="cx"> 'title' => __( 'Post Via Email' ),
</span><del>- 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.' ) . '</p>',
</del><ins>+ 'content' => '<p>' . __( 'Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it’s a good idea to keep this address very secret.', 'post-by-email' ) . '</p>',
</ins><span class="cx"> ) );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -164,11 +164,11 @@
</span><span class="cx"> public function admin_notices() {
</span><span class="cx"> $options = get_option( 'post_by_email_options' );
</span><span class="cx"> $settings_url = admin_url( 'tools.php?page=post-by-email' );
</span><del>- if ( ! $options || ! isset( $options['status'] ) || $options['status'] == 'unconfigured' ) {
</del><ins>+ if ( ! $options || ! isset( $options['status'] ) || 'unconfigured' == $options['status'] ) {
</ins><span class="cx"> echo "<div class='error'><p>";
</span><span class="cx"> _e( "Notice: Post By Email is currently disabled. To post to your blog via email, please <a href='$settings_url'>configure your settings now</a>.", 'post-by-email' );
</span><span class="cx"> echo "</p></div>";
</span><del>- } elseif ( $options['status'] == 'error' ) {
</del><ins>+ } elseif ( 'error' == $options['status'] ) {
</ins><span class="cx"> echo "<div class='error'><p>";
</span><span class="cx"> _e( "Post By Email encountered an error. <a href='$settings_url&tab=log'>View the log</a> for details.", 'post-by-email' );
</span><span class="cx"> echo "</p></div>";
</span></span></pre></div>
<a id="2013codebykatpostbyemailtrunkclasspostbyemailphp"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/class-post-by-email.php (2301 => 2302)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-12 22:19:04 UTC (rev 2301)
+++ 2013/codebykat/post-by-email/trunk/class-post-by-email.php 2013-09-12 22:35:01 UTC (rev 2302)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 0.9.0
</span><span class="cx"> *
</span><del>- * @param boolean $network_wide True if WPMU superadmin uses "Network Activate" action, false if WPMU is disabled or plugin is activated on an individual blog.
</del><ins>+ * @param boolean $network_wide True if multisite superadmin uses "Network Activate" action, false if multisite is disabled or plugin is activated on an individual blog.
</ins><span class="cx"> */
</span><span class="cx"> public static function activate( $network_wide ) {
</span><span class="cx"> // set up plugin options
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> update_option( 'post_by_email_options', $options );
</span><span class="cx">
</span><span class="cx"> // if options aren't set, there's nothing to do, move along
</span><del>- if ( $options['status'] == 'unconfigured' ) {
</del><ins>+ if ( 'unconfigured' == $options['status'] ) {
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Returns the site administrator's ID (used to set the author of posts sent from unrecognized email addresses).
</span><span class="cx"> *
</span><del>- * @since 1.0.2
</del><ins>+ * @since 1.0.1
</ins><span class="cx"> *
</span><span class="cx"> * @return integer $id
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
</body>
</html>