<!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>[2255] 2013/codebykat/post-by-email/trunk/22942_updated_for_3.7.diff: removed Help options and fixed some spacing issues</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/2255">2255</a></dd>
<dt>Author</dt> <dd>codebykat</dd>
<dt>Date</dt> <dd>2013-09-04 05:46:42 +0000 (Wed, 04 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>removed Help options and fixed some spacing issues</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#2013codebykatpostbyemailtrunk22942_updated_for_37diff">2013/codebykat/post-by-email/trunk/22942_updated_for_3.7.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="2013codebykatpostbyemailtrunk22942_updated_for_37diff"></a>
<div class="modfile"><h4>Modified: 2013/codebykat/post-by-email/trunk/22942_updated_for_3.7.diff (2254 => 2255)</h4>
<pre class="diff"><span>
<span class="info">--- 2013/codebykat/post-by-email/trunk/22942_updated_for_3.7.diff 2013-09-03 21:14:26 UTC (rev 2254)
+++ 2013/codebykat/post-by-email/trunk/22942_updated_for_3.7.diff 2013-09-04 05:46:42 UTC (rev 2255)
</span><span class="lines">@@ -24,14 +24,14 @@
</span><span class="cx">
</span><span class="cx"> // 3.3
</span><span class="cx"> diff --git wp-admin/includes/upgrade.php wp-admin/includes/upgrade.php
</span><del>-index 0d17d8f..fdf8907 100644
</del><ins>+index 0d17d8f..63e6c1a 100644
</ins><span class="cx"> --- wp-admin/includes/upgrade.php
</span><span class="cx"> +++ wp-admin/includes/upgrade.php
</span><span class="cx"> @@ -402,10 +402,15 @@ function upgrade_all() {
</span><span class="cx"> if ( $wp_current_db_version < 22422 )
</span><span class="cx"> upgrade_350();
</span><span class="cx">
</span><del>-+ if ( $wp_current_db_version < 25134 )
</del><ins>++ if ( $wp_current_db_version < 25150 )
</ins><span class="cx"> + upgrade_370();
</span><span class="cx"> +
</span><span class="cx"> maybe_disable_link_manager();
</span><span class="lines">@@ -82,25 +82,30 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> diff --git wp-admin/options-writing.php wp-admin/options-writing.php
</span><del>-index 8015bae..e38dea3 100644
</del><ins>+index 8015bae..8c0ea6d 100644
</ins><span class="cx"> --- wp-admin/options-writing.php
</span><span class="cx"> +++ wp-admin/options-writing.php
</span><del>-@@ -28,7 +28,7 @@ get_current_screen()->add_help_tab( array(
</del><ins>+@@ -28,14 +28,6 @@ get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'content' => '<p>' . __('Press This is a bookmarklet that makes it easy to blog about something you come across on the web. You can use it to just grab a link, or to post an excerpt. Press This will even allow you to choose from images included on the page and use them in your post. Just drag the Press This link on this screen to your bookmarks bar in your browser, and you’ll be on your way to easier content creation. Clicking on it while on another website opens a popup window with all these options.') . '</p>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> -if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
</span><del>-+if ( get_option( 'post_by_email_enabled' ) && apply_filters( 'enable_post_by_email_configuration', true ) ) {
</del><ins>+- get_current_screen()->add_help_tab( array(
+- 'id' => 'options-postemail',
+- 'title' => __( 'Post Via Email' ),
+- '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>',
+- ) );
+-}
+-
+ if ( apply_filters( 'enable_update_services_configuration', true ) ) {
</ins><span class="cx"> get_current_screen()->add_help_tab( array(
</span><del>- 'id' => 'options-postemail',
- 'title' => __( 'Post Via Email' ),
-@@ -122,34 +122,9 @@ do_settings_fields('writing', 'remote_publishing'); // A deprecated section.
</del><ins>+ 'id' => 'options-services',
+@@ -122,34 +114,9 @@ do_settings_fields('writing', 'remote_publishing'); // A deprecated section.
</ins><span class="cx"> <p><textarea rows="5" cols="120" readonly="readonly"><?php echo htmlspecialchars( get_shortcut_link() ); ?></textarea></p>
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> -<?php if ( apply_filters( 'enable_post_by_email_configuration', true ) ) { ?>
</span><del>-+<?php if ( get_option( 'post_by_email_enabled' ) && apply_filters( 'enable_post_by_email_configuration', true ) ) { ?>
- <h3 class="title"><?php _e('Post via e-mail') ?></h3>
</del><ins>+-<h3 class="title"><?php _e('Post via e-mail') ?></h3>
</ins><span class="cx"> -<p><?php printf(__('To post to WordPress by e-mail you must set up a secret e-mail account with POP3 access. Any mail received at this address will be posted, so it’s a good idea to keep this address very secret. Here are three random strings you could use: <kbd>%s</kbd>, <kbd>%s</kbd>, <kbd>%s</kbd>.'), wp_generate_password(8, false), wp_generate_password(8, false), wp_generate_password(8, false)) ?></p>
</span><span class="cx"> -
</span><span class="cx"> -<table class="form-table">
</span><span class="lines">@@ -127,15 +132,17 @@
</span><span class="cx"> -<?php
</span><span class="cx"> -wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'default_email_category', 'orderby' => 'name', 'selected' => get_option('default_email_category'), 'hierarchical' => true));
</span><span class="cx"> -?>
</span><del>-+<p><?php _e('This functionality is no longer packaged with WordPress. To continue using it, please install the <a href="http://wordpress.org/plugins/post-by-email">Post By Email plugin</a>.'); ?></p>
</del><ins>++<?php if ( get_option( 'post_by_email_enabled' ) && apply_filters( 'enable_post_by_email_configuration', true ) ) { ?>
++<h3 class="title"><?php _e( 'Post via e-mail' ) ?></h3>
++<p><?php _e( 'This functionality is no longer packaged with WordPress. To continue using it, please install the <a href="http://wordpress.org/plugins/post-by-email">Post By Email plugin</a>.' ); ?></p>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php do_settings_fields('writing', 'post_via_email'); ?>
</span><span class="cx"> diff --git wp-includes/default-filters.php wp-includes/default-filters.php
</span><del>-index 84d43aa..8acef7e 100644
</del><ins>+index 7c55dfb..485faea 100644
</ins><span class="cx"> --- wp-includes/default-filters.php
</span><span class="cx"> +++ wp-includes/default-filters.php
</span><del>-@@ -305,4 +305,7 @@ add_filter( 'heartbeat_nopriv_received', 'wp_auth_check', 10, 2 );
</del><ins>+@@ -301,4 +301,7 @@ add_filter( 'heartbeat_nopriv_received', 'wp_auth_check', 10, 2 );
</ins><span class="cx"> add_filter( 'authenticate', 'wp_authenticate_username_password', 20, 3 );
</span><span class="cx"> add_filter( 'authenticate', 'wp_authenticate_spam_check', 99 );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>