<!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>[25881] branches/3.7/src: Pinking shears</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://core.trac.wordpress.org/changeset/25881">25881</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2013-10-23 14:39:36 +0000 (Wed, 23 Oct 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches37srcwpadminadminfooterphp">branches/3.7/src/wp-admin/admin-footer.php</a></li>
<li><a href="#branches37srcwpadmincommentphp">branches/3.7/src/wp-admin/comment.php</a></li>
<li><a href="#branches37srcwpadminincludesclasswpmedialisttablephp">branches/3.7/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#branches37srcwpadminincludesclasswpupgraderskinsphp">branches/3.7/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>
<li><a href="#branches37srcwpadminincludesclasswpupgraderphp">branches/3.7/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#branches37srcwpadminincludesdeprecatedphp">branches/3.7/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#branches37srcwpadminincludesmsphp">branches/3.7/src/wp-admin/includes/ms.php</a></li>
<li><a href="#branches37srcwpadminincludespluginphp">branches/3.7/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#branches37srcwpadminindexphp">branches/3.7/src/wp-admin/index.php</a></li>
<li><a href="#branches37srcwpadminjsaboutjs">branches/3.7/src/wp-admin/js/about.js</a></li>
<li><a href="#branches37srcwpadminnetworkphp">branches/3.7/src/wp-admin/network.php</a></li>
<li><a href="#branches37srcwpadminoptionsgeneralphp">branches/3.7/src/wp-admin/options-general.php</a></li>
<li><a href="#branches37srcwpadminoptionsreadingphp">branches/3.7/src/wp-admin/options-reading.php</a></li>
<li><a href="#branches37srcwpadminoptionsphp">branches/3.7/src/wp-admin/options.php</a></li>
<li><a href="#branches37srcwpadminrevisionphp">branches/3.7/src/wp-admin/revision.php</a></li>
<li><a href="#branches37srcwpadminupdatecorephp">branches/3.7/src/wp-admin/update-core.php</a></li>
<li><a href="#branches37srcwpadminusernewphp">branches/3.7/src/wp-admin/user-new.php</a></li>
<li><a href="#branches37srcwpadminwidgetsphp">branches/3.7/src/wp-admin/widgets.php</a></li>
<li><a href="#branches37srcwpincludescategoryphp">branches/3.7/src/wp-includes/category.php</a></li>
<li><a href="#branches37srcwpincludesclasshttpphp">branches/3.7/src/wp-includes/class-http.php</a></li>
<li><a href="#branches37srcwpincludesclasswpadminbarphp">branches/3.7/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#branches37srcwpincludesclasswpwalkerphp">branches/3.7/src/wp-includes/class-wp-walker.php</a></li>
<li><a href="#branches37srcwpincludesfeedrdfphp">branches/3.7/src/wp-includes/feed-rdf.php</a></li>
<li><a href="#branches37srcwpincludesfeedrssphp">branches/3.7/src/wp-includes/feed-rss.php</a></li>
<li><a href="#branches37srcwpincludesfeedrss2commentsphp">branches/3.7/src/wp-includes/feed-rss2-comments.php</a></li>
<li><a href="#branches37srcwpincludesmsloadphp">branches/3.7/src/wp-includes/ms-load.php</a></li>
<li><a href="#branches37srcwpincludesshortcodesphp">branches/3.7/src/wp-includes/shortcodes.php</a></li>
<li><a href="#branches37srcwpincludesupdatephp">branches/3.7/src/wp-includes/update.php</a></li>
<li><a href="#branches37srcwpincludesvarsphp">branches/3.7/src/wp-includes/vars.php</a></li>
<li><a href="#branches37srcwploginphp">branches/3.7/src/wp-login.php</a></li>
<li><a href="#branches37srcxmlrpcphp">branches/3.7/src/xmlrpc.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches37src">branches/3.7/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/3.7/src
</span><span class="cx">===================================================================
</span><del>--- branches/3.7/src 2013-10-23 14:37:54 UTC (rev 25880)
</del><ins>+++ branches/3.7/src 2013-10-23 14:39:36 UTC (rev 25881)
</ins><a id="branches37src"></a>
<div class="propset"><h4>Property changes: branches/3.7/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="addfile"><h4>Added: svn:mergeinfo</h4></div>
<ins>+/branches/3.1/src:18031
+/branches/3.3/src:20543
+/branches/3.4/src:21757
+/trunk/src:18512,25880
</ins><span class="cx">\ No newline at end of property
</span><a id="branches37srcwpadminadminfooterphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/admin-footer.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/admin-footer.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/admin-footer.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -21,17 +21,17 @@
</span><span class="cx"> * Fires after the opening tag for the admin footer.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><del>- */
- do_action( 'in_admin_footer' );
</del><ins>+ */
+ do_action( 'in_admin_footer' );
</ins><span class="cx"> ?>
</span><span class="cx"> <p id="footer-left" class="alignleft">
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Filter the "Thank you" text displayed in the admin footer.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.8.0
</span><span class="cx"> * @param string The content that will be printed.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> echo apply_filters( 'admin_footer_text', '<span id="footer-thankyou">' . __( 'Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.' ) . '</span>' );
</span><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="lines">@@ -42,11 +42,11 @@
</span><span class="cx"> *
</span><span class="cx"> * @see core_update_footer() WordPress prints the current version and update information,
</span><span class="cx"> * using core_update_footer() at priority 10.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @param string The content that will be printed.
</span><span class="cx"> */
</span><del>- echo apply_filters( 'update_footer', '' );
</del><ins>+ echo apply_filters( 'update_footer', '' );
</ins><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="cx"> <div class="clear"></div>
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Print scripts or data before the default footer scripts.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 1.2.0
</span><span class="cx"> * @param string The data to print.
</span><span class="cx"> */
</span><span class="lines">@@ -62,16 +62,16 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Prints any scripts and data queued for the footer.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> do_action('admin_print_footer_scripts');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Print scripts or data after the default footer scripts.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.8.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $GLOBALS['hook_suffix'] The current admin page.
</span><span class="cx"> */
</span><span class="cx"> do_action("admin_footer-" . $GLOBALS['hook_suffix']);
</span></span></pre></div>
<a id="branches37srcwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/comment.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/comment.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/comment.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> edit_comment();
</span><span class="cx">
</span><span class="cx"> $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the URI the user is redirected to after editing a comment in the admin.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/class-wp-media-list-table.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/class-wp-media-list-table.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/class-wp-media-list-table.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -308,7 +308,7 @@
</span><span class="cx">
</span><span class="cx"> if ( $parent ) {
</span><span class="cx"> $title = _draft_or_post_title( $post->post_parent );
</span><del>- $parent_type = get_post_type_object( $parent->post_type );
</del><ins>+ $parent_type = get_post_type_object( $parent->post_type );
</ins><span class="cx"> ?>
</span><span class="cx"> <td <?php echo $attributes ?>><strong>
</span><span class="cx"> <?php if ( current_user_can( 'edit_post', $post->post_parent ) && $parent_type->show_ui ) { ?>
</span></span></pre></div>
<a id="branches37srcwpadminincludesclasswpupgraderskinsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/class-wp-upgrader-skins.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/class-wp-upgrader-skins.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/class-wp-upgrader-skins.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Upgrader Skin for Automatic WordPress Upgrades
</span><span class="cx"> *
</span><del>- * This skin is designed to be used when no output is intended, all output
</del><ins>+ * This skin is designed to be used when no output is intended, all output
</ins><span class="cx"> * is captured and stored for the caller to process and log/email/discard.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre></div>
<a id="branches37srcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/class-wp-upgrader.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/class-wp-upgrader.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/class-wp-upgrader.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -1933,10 +1933,10 @@
</span><span class="cx"> update_option( $lock_name, time() );
</span><span class="cx">
</span><span class="cx"> // Don't automatically run these thins, as we'll handle it ourselves
</span><del>- remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
- remove_action( 'upgrader_process_complete', 'wp_version_check' );
- remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
- remove_action( 'upgrader_process_complete', 'wp_update_themes' );
</del><ins>+ remove_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
+ remove_action( 'upgrader_process_complete', 'wp_version_check' );
+ remove_action( 'upgrader_process_complete', 'wp_update_plugins' );
+ remove_action( 'upgrader_process_complete', 'wp_update_themes' );
</ins><span class="cx">
</span><span class="cx"> // Next, Plugins
</span><span class="cx"> wp_update_plugins(); // Check for Plugin updates
</span><span class="lines">@@ -2270,7 +2270,7 @@
</span><span class="cx"> * @type string $subject The email's subject.
</span><span class="cx"> * @type string $body The email message body.
</span><span class="cx"> * @type string $headers Any email headers, defaults to no headers.
</span><del>- * }
</del><ins>+ * }
</ins><span class="cx"> * @param string $type The type of email being sent. Can be one of 'success', 'fail', 'manual', 'critical'.
</span><span class="cx"> * @param object $core_update The update offer that was attempted.
</span><span class="cx"> * @param mixed $result The result for the core update. Can be WP_Error.
</span></span></pre></div>
<a id="branches37srcwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/deprecated.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/deprecated.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/deprecated.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -1121,8 +1121,8 @@
</span><span class="cx"> * This was once used to display attachment links. Now it is deprecated and stubbed.
</span><span class="cx"> *
</span><span class="cx"> * {@internal Missing Short Description}}
</span><del>- *
- * @since 2.0.0
</del><ins>+ *
+ * @since 2.0.0
</ins><span class="cx"> * @deprecated 3.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $id
</span></span></pre></div>
<a id="branches37srcwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/ms.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/ms.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/ms.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> $blog = get_blog_details( $blog_id );
</span><span class="cx"> /**
</span><del>- * Fires before a blog is deleted.
</del><ins>+ * Fires before a blog is deleted.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> 'newemail' => $_POST['email']
</span><span class="cx"> );
</span><span class="cx"> update_option( $current_user->ID . '_new_email', $new_user_email );
</span><del>-
</del><ins>+
</ins><span class="cx"> $email_text = __( 'Dear user,
</span><span class="cx">
</span><span class="cx"> You recently requested to have the email address on your account changed.
</span><span class="lines">@@ -315,10 +315,10 @@
</span><span class="cx"> * Filter the email text sent when a user changes emails.
</span><span class="cx"> *
</span><span class="cx"> * The following strings have a special meaning and will get replaced dynamically:
</span><del>- * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
- * ###EMAIL### The new email.
</del><ins>+ * ###ADMIN_URL### The link to click on to confirm the email change. Required otherwise this functunalty is will break.
+ * ###EMAIL### The new email.
</ins><span class="cx"> * ###SITENAME### The name of the site.
</span><del>- * ###SITEURL### The URL to the site.
</del><ins>+ * ###SITEURL### The URL to the site.
</ins><span class="cx"> *
</span><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="lines">@@ -448,9 +448,9 @@
</span><span class="cx"> if ( $value == 1 ) {
</span><span class="cx"> /**
</span><span class="cx"> * Fires after the user is marked as a SPAM user.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $id ID of the user marked as SPAM.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'make_spam_user', $id );
</span><span class="lines">@@ -459,7 +459,7 @@
</span><span class="cx"> * Fires after the user is marked as a HAM user. Opposite of SPAM.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $id ID of the user marked as HAM.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'make_ham_user', $id );
</span><span class="lines">@@ -494,10 +494,10 @@
</span><span class="cx"> 'sg' => 'Sango', 'sa' => 'Sanskrit', 'sr' => 'Serbian', 'hr' => 'Croatian', 'si' => 'Sinhala; Sinhalese', 'sk' => 'Slovak', 'sl' => 'Slovenian', 'se' => 'Northern Sami', 'sm' => 'Samoan', 'sn' => 'Shona', 'sd' => 'Sindhi', 'so' => 'Somali', 'st' => 'Sotho, Southern', 'es' => 'Spanish; Castilian', 'sc' => 'Sardinian', 'ss' => 'Swati', 'su' => 'Sundanese', 'sw' => 'Swahili',
</span><span class="cx"> 'sv' => 'Swedish', 'ty' => 'Tahitian', 'ta' => 'Tamil', 'tt' => 'Tatar', 'te' => 'Telugu', 'tg' => 'Tajik', 'tl' => 'Tagalog', 'th' => 'Thai', 'bo' => 'Tibetan', 'ti' => 'Tigrinya', 'to' => 'Tonga (Tonga Islands)', 'tn' => 'Tswana', 'ts' => 'Tsonga', 'tk' => 'Turkmen', 'tr' => 'Turkish', 'tw' => 'Twi', 'ug' => 'Uighur; Uyghur', 'uk' => 'Ukrainian', 'ur' => 'Urdu', 'uz' => 'Uzbek',
</span><span class="cx"> 've' => 'Venda', 'vi' => 'Vietnamese', 'vo' => 'Volapük', 'cy' => 'Welsh','wa' => 'Walloon','wo' => 'Wolof', 'xh' => 'Xhosa', 'yi' => 'Yiddish', 'yo' => 'Yoruba', 'za' => 'Zhuang; Chuang', 'zu' => 'Zulu' );
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the language codes.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since MU
</span><span class="cx"> *
</span><span class="cx"> * @param array $lang_codes Key/value pair of language codes where key is the short version.
</span><span class="lines">@@ -699,7 +699,7 @@
</span><span class="cx"> // If global super_admins override is defined, there is nothing to do here.
</span><span class="cx"> if ( isset( $super_admins ) )
</span><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Fires before the user is granted Super Admin privileges.
</span><span class="cx"> *
</span><span class="lines">@@ -716,7 +716,7 @@
</span><span class="cx"> if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
</span><span class="cx"> $super_admins[] = $user->user_login;
</span><span class="cx"> update_site_option( 'site_admins' , $super_admins );
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Fires after the user is granted Super Admin privileges.
</span><span class="cx"> *
</span><span class="lines">@@ -760,7 +760,7 @@
</span><span class="cx"> if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
</span><span class="cx"> unset( $super_admins[$key] );
</span><span class="cx"> update_site_option( 'site_admins', $super_admins );
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Fires after the user's Super Admin privileges are revoked.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/includes/plugin.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/includes/plugin.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/includes/plugin.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> if ( ! $silent ) {
</span><span class="cx"> /**
</span><span class="cx"> * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $plugin Plugin path to main plugin file with plugin data.
</span><span class="lines">@@ -553,10 +553,10 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Fires before a plugin is activated in activate_plugin() when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The action concatenates the 'activate_' prefix with the $plugin value passed to
</span><span class="cx"> * activate_plugin() to create a dynamically-named action.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $network_wide Whether to enable the plugin for all sites in the network
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> if ( ! $silent ) {
</span><span class="cx"> /**
</span><span class="cx"> * Fires after a plugin has been activated in activate_plugin() when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $plugin Plugin path to main plugin file with plugin data.
</span><span class="lines">@@ -627,11 +627,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Fires for each plugin being deactivated in deactivate_plugins(), before deactivation
</span><span class="cx"> * and when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $plugin Plugin path to main plugin file with plugin data.
</span><del>- * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</del><ins>+ * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</ins><span class="cx"> * or just the current site. Multisite only. Default is false.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'deactivate_plugin', $plugin, $network_deactivating );
</span><span class="lines">@@ -657,13 +657,13 @@
</span><span class="cx"> /**
</span><span class="cx"> * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
</span><span class="cx"> * and when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The action concatenates the 'deactivate_' prefix with the plugin's basename
</span><span class="cx"> * to create a dynamically-named action.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><del>- * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</del><ins>+ * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</ins><span class="cx"> * or just the current site. Multisite only. Default is false.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'deactivate_' . $plugin, $network_deactivating );
</span><span class="lines">@@ -671,11 +671,11 @@
</span><span class="cx"> /**
</span><span class="cx"> * Fires for each plugin being deactivated in deactivate_plugins(), after deactivation
</span><span class="cx"> * and when the $silent parameter is false.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $plugin Plugin path to main plugin file with plugin data.
</span><del>- * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</del><ins>+ * @param bool $network_deactivating Whether the plugin is deactivated for all sites in the network
</ins><span class="cx"> * or just the current site. Multisite only. Default is false.
</span><span class="cx"> */
</span><span class="cx"> do_action( 'deactivated_plugin', $plugin, $network_deactivating );
</span><span class="lines">@@ -931,7 +931,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Fires in uninstall_plugin() once the plugin has been uninstalled.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * The action concatenates the 'uninstall_' prefix with the basename of the
</span><span class="cx"> * plugin passed to {@see uninstall_plugin()} to create a dynamically-named action.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpadminindexphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/index.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/index.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/index.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -123,13 +123,13 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Add content to the welcome panel on the admin dashboard.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * To remove the default welcome panel, use remove_action():
</span><span class="cx"> * <code>remove_action( 'welcome_panel', 'wp_welcome_panel' );</code>
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.5.0
</span><span class="cx"> */
</span><del>- do_action( 'welcome_panel' );
</del><ins>+ do_action( 'welcome_panel' );
</ins><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span></span></pre></div>
<a id="branches37srcwpadminjsaboutjs"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/js/about.js (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/js/about.js 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/js/about.js 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -40,22 +40,22 @@
</span><span class="cx"> // Look like real typing by changing the speed new letters are added each time
</span><span class="cx"> setTimeout(animate, 220 + Math.floor(Math.random() * ( 800 - 220)) );
</span><span class="cx"> }
</span><del>- //
</del><ins>+ //
</ins><span class="cx"> function begin(){
</span><del>- // we async load zxcvbn, so we need to make sure it's loaded before starting
</del><ins>+ // we async load zxcvbn, so we need to make sure it's loaded before starting
</ins><span class="cx"> if (typeof(zxcvbn) !== 'undefined')
</span><span class="cx"> animate();
</span><span class="cx"> else
</span><span class="cx"> setTimeout(begin,800);
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Turn off the animation on focus
</span><span class="cx"> $input.on('focus', function(){
</span><span class="cx"> shouldAnimate = false;
</span><span class="cx"> resetMeter();
</span><span class="cx"> });
</span><span class="cx">
</span><del>- // Act like a normal password strength meter
</del><ins>+ // Act like a normal password strength meter
</ins><span class="cx"> $input.on('keyup', function(){
</span><span class="cx"> updateResult();
</span><span class="cx"> });
</span></span></pre></div>
<a id="branches37srcwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/network.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/network.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/network.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -67,9 +67,9 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> /**
</span><span class="cx"> * Filter whether to enable the subdirectory install feature in Multisite.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param bool true Whether to enable the subdirectory install feature in Multisite. Default is false.
</span><span class="cx"> */
</span><span class="cx"> if ( apply_filters( 'allow_subdirectory_install', false ) )
</span></span></pre></div>
<a id="branches37srcwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/options-general.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/options-general.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/options-general.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Filter the default time formats.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $default_time_formats Array of default time formats.
</span></span></pre></div>
<a id="branches37srcwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/options-reading.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/options-reading.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/options-reading.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
</span><span class="cx"> <label for="blog-norobots"><?php _e( 'Discourage search engines from indexing this site' ); ?></label>
</span><span class="cx"> <p class="description"><?php _e( 'Note: Neither of these options blocks access to your site — it is up to search engines to honor your request.' ); ?></p>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Enable the legacy 'Site Visibility' privacy options.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/options.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/options.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/options.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -30,15 +30,15 @@
</span><span class="cx"> $option_page = 'options';
</span><span class="cx"> else
</span><span class="cx">
</span><del>- /**
- * Filter the capability required when using the Settings API.
- *
- * By default, the options groups for all registered settings require the manage_options capability.
- * This filter is required to change the capability required for a certain options page.
- *
</del><ins>+ /**
+ * Filter the capability required when using the Settings API.
+ *
+ * By default, the options groups for all registered settings require the manage_options capability.
+ * This filter is required to change the capability required for a certain options page.
+ *
</ins><span class="cx"> * @since 3.2.0
</span><del>- *
- * @param string $capability The capability used for the page, which is manage_options by default.
</del><ins>+ *
+ * @param string $capability The capability used for the page, which is manage_options by default.
</ins><span class="cx"> */
</span><span class="cx"> $capability = apply_filters( "option_page_capability_{$option_page}", $capability );
</span><span class="cx">
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $whitelist_options['general'][] = 'new_admin_email';
</span><span class="cx"> $whitelist_options['general'][] = 'WPLANG';
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Toggle post-by-email functionality.
</span><span class="cx"> *
</span><span class="lines">@@ -119,8 +119,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Filter the options white list.
- *
</del><ins>+ * Filter the options white list.
+ *
</ins><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param array White list options.
</span></span></pre></div>
<a id="branches37srcwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/revision.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/revision.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/revision.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -1,16 +1,16 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><span class="cx"> * Revisions administration panel
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Requires wp-admin/includes/revision.php.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Administration
</span><span class="cx"> * @since 2.6.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int revision Optional. The revision ID.
</span><span class="cx"> * @param string action The action to take.
</span><del>- * Accepts 'restore', 'view' or 'edit'.
</del><ins>+ * Accepts 'restore', 'view' or 'edit'.
</ins><span class="cx"> * @param int from The revision to compare from.
</span><span class="cx"> * @param int to Optional, required if revision missing. The revision to compare to.
</span><span class="cx"> */
</span></span></pre></div>
<a id="branches37srcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/update-core.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/update-core.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/update-core.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> function list_core_update( $update ) {
</span><span class="cx"> global $wp_local_package, $wpdb, $wp_version;
</span><span class="cx"> static $first_pass = true;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
</span><span class="cx"> $version_string = $update->current;
</span><span class="cx"> // If the only available update is a partial builds, it doesn't need a language-specific version string.
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> $version_string = $update->current;
</span><span class="cx"> else
</span><span class="cx"> $version_string = sprintf( "%s–<strong>%s</strong>", $update->current, $update->locale );
</span><del>-
</del><ins>+
</ins><span class="cx"> $current = false;
</span><span class="cx"> if ( !isset($update->response) || 'latest' == $update->response )
</span><span class="cx"> $current = true;
</span></span></pre></div>
<a id="branches37srcwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/user-new.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/user-new.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/user-new.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -116,13 +116,13 @@
</span><span class="cx"> if ( is_wp_error( $user_details[ 'errors' ] ) && !empty( $user_details[ 'errors' ]->errors ) ) {
</span><span class="cx"> $add_user_errors = $user_details[ 'errors' ];
</span><span class="cx"> } else {
</span><del>- /**
</del><ins>+ /**
</ins><span class="cx"> * Filter the user_login, aka the username, before it is added to the site.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- *
- * @param string $_REQUEST['user_login'] The sanitized username.
- */
</del><ins>+ *
+ * @param string $_REQUEST['user_login'] The sanitized username.
+ */
</ins><span class="cx"> $new_user_login = apply_filters( 'pre_user_login', sanitize_user( wp_unslash( $_REQUEST['user_login'] ), true ) );
</span><span class="cx"> if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
</span><span class="cx"> add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
</span><span class="lines">@@ -188,13 +188,13 @@
</span><span class="cx"> wp_enqueue_script('wp-ajax-response');
</span><span class="cx"> wp_enqueue_script('user-profile');
</span><span class="cx">
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Allows you to enable user auto-complete for non-super admins in multisite.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.4.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param bool True or false, based on if you enable auto-complete for non-super admins. Default is false.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
</span><span class="cx"> && ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
</span><span class="cx"> ) {
</span><span class="lines">@@ -281,11 +281,11 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <?php
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Fires inside the adduser form tag.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> ?>
</span><span class="cx"> <form action="" method="post" name="adduser" id="adduser" class="validate"<?php do_action('user_new_form_tag');?>>
</span><span class="cx"> <input name="action" type="hidden" value="adduser" />
</span><span class="lines">@@ -376,14 +376,14 @@
</span><span class="cx"> <th scope="row"><label for="url"><?php _e('Website') ?></label></th>
</span><span class="cx"> <td><input name="url" type="text" id="url" class="code" value="<?php echo esc_attr($new_user_uri); ?>" /></td>
</span><span class="cx"> </tr>
</span><del>-<?php
-/**
</del><ins>+<?php
+/**
</ins><span class="cx"> * Filter the display of the password fields.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 1.5.1
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param bool True or false, based on if you want to show the password fields. Default is true.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> if ( apply_filters( 'show_password_fields', true ) ) : ?>
</span><span class="cx"> <tr class="form-field form-required">
</span><span class="cx"> <th scope="row"><label for="pass1"><?php _e('Password'); ?> <span class="description"><?php /* translators: password input field */_e('(required)'); ?></span></label></th>
</span></span></pre></div>
<a id="branches37srcwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-admin/widgets.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-admin/widgets.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-admin/widgets.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> <div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>-<?php
</del><ins>+<?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires before the Widgets administration page content loads.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpincludescategoryphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/category.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/category.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/category.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -271,7 +271,7 @@
</span><span class="cx"> $return = array();
</span><span class="cx"> return $return;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Filter the array of term objects returned for the 'post_tag' taxonomy.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/class-http.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/class-http.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/class-http.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wp_remote_request( $redirect_location, $args );
</del><ins>+ return wp_remote_request( $redirect_location, $args );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -944,7 +944,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Verifies the received SSL certificate against it's Common Names and subjectAltName fields
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * PHP's SSL verifications only verify that it's a valid Certificate, it doesn't verify if
</span><span class="cx"> * the certificate is valid for the hostname which was requested.
</span><span class="cx"> * This function verifies the requested hostname against certificate's subjectAltName field,
</span></span></pre></div>
<a id="branches37srcwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/class-wp-admin-bar.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/class-wp-admin-bar.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/class-wp-admin-bar.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> * To remove the default padding styles from WordPress for the Toolbar, use the following code:
</span><span class="cx"> * add_theme_support( 'admin-bar', array( 'callback' => '__return_false' ) );
</span><span class="cx"> */
</span><del>- $admin_bar_args = get_theme_support( 'admin-bar' );
</del><ins>+ $admin_bar_args = get_theme_support( 'admin-bar' );
</ins><span class="cx"> $header_callback = $admin_bar_args[0]['callback'];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches37srcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/class-wp-walker.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/class-wp-walker.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/class-wp-walker.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> * only needs to implement the methods that are needed.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @package WordPress
</span><span class="cx"> * @abstract
</span><span class="cx"> */
</span></span></pre></div>
<a id="branches37srcwpincludesfeedrdfphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/feed-rdf.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/feed-rdf.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/feed-rdf.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -16,13 +16,13 @@
</span><span class="cx"> xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
</span><span class="cx"> xmlns:admin="http://webns.net/mvcb/"
</span><span class="cx"> xmlns:content="http://purl.org/rss/1.0/modules/content/"
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires at the end of the feed root to add namespaces.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><del>- do_action( 'rdf_ns' );
</del><ins>+ do_action( 'rdf_ns' );
</ins><span class="cx"> ?>
</span><span class="cx"> >
</span><span class="cx"> <channel rdf:about="<?php bloginfo_rss("url") ?>">
</span><span class="lines">@@ -35,13 +35,13 @@
</span><span class="cx"> <?php /** This filter is documented in wp-includes/feed-rss2.php */ ?>
</span><span class="cx"> <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
</span><span class="cx"> <sy:updateBase>2000-01-01T12:00+00:00</sy:updateBase>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires at the end of the RDF feed header.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><del>- do_action( 'rdf_header' );
</del><ins>+ do_action( 'rdf_header' );
</ins><span class="cx"> ?>
</span><span class="cx"> <items>
</span><span class="cx"> <rdf:Seq>
</span><span class="lines">@@ -64,13 +64,13 @@
</span><span class="cx"> <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
</span><span class="cx"> <content:encoded><![CDATA[<?php the_content_feed('rdf') ?>]]></content:encoded>
</span><span class="cx"> <?php endif; ?>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires at the end of each RDF feed item.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> */
</span><del>- do_action( 'rdf_item' );
</del><ins>+ do_action( 'rdf_item' );
</ins><span class="cx"> ?>
</span><span class="cx"> </item>
</span><span class="cx"> <?php endwhile; ?>
</span></span></pre></div>
<a id="branches37srcwpincludesfeedrssphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/feed-rss.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/feed-rss.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/feed-rss.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> * Fires at the end of the RSS Feed Header.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> do_action( 'rss_head' );
</span><span class="cx"> ?>
</span><span class="cx">
</span></span></pre></div>
<a id="branches37srcwpincludesfeedrss2commentsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/feed-rss2-comments.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/feed-rss2-comments.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/feed-rss2-comments.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -14,12 +14,12 @@
</span><span class="cx"> xmlns:dc="http://purl.org/dc/elements/1.1/"
</span><span class="cx"> xmlns:atom="http://www.w3.org/2005/Atom"
</span><span class="cx"> xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /** This action is documented in wp-includes/feed-rss2.php */
</span><span class="cx"> do_action( 'rss2_ns' );
</span><span class="cx"> ?>
</span><span class="cx">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires at the end of the RSS root to add namespaces.
</span><span class="cx"> *
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
</span><span class="cx"> <?php /** This filter is documented in wp-includes/feed-rss2.php */ ?>
</span><span class="cx"> <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> /**
</span><span class="cx"> * Fires at the end of the RSS2 comment feed header.
</span><span class="cx"> *
</span></span></pre></div>
<a id="branches37srcwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/ms-load.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/ms-load.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/ms-load.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Filter checking the status of the current blog.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 1.2.1
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param bool null Whether to skip the blog status check. Default null.
</span><span class="cx"> */
</span><span class="cx"> $check = apply_filters( 'ms_site_check', null );
</span></span></pre></div>
<a id="branches37srcwpincludesshortcodesphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/shortcodes.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/shortcodes.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/shortcodes.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Filter a shortcode's default attributes.
</span><span class="cx"> *
</span><del>- * If the third parameter of the shortcode_atts() function is present then this filter is available.
</del><ins>+ * If the third parameter of the shortcode_atts() function is present then this filter is available.
</ins><span class="cx"> * The third parameter, $shortcode, is the name of the shortcode.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.6.0
</span></span></pre></div>
<a id="branches37srcwpincludesupdatephp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/update.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/update.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/update.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses $wp_version Used to check against the newest WordPress version.
</span><span class="cx"> *
</span><del>- * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</del><ins>+ * @param array $extra_stats Extra statistics to report to the WordPress.org API.
</ins><span class="cx"> * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
</span><span class="cx"> */
</span><span class="cx"> function wp_version_check( $extra_stats = array() ) {
</span></span></pre></div>
<a id="branches37srcwpincludesvarsphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-includes/vars.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-includes/vars.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-includes/vars.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -95,11 +95,11 @@
</span><span class="cx"> $is_apache = (strpos($_SERVER['SERVER_SOFTWARE'], 'Apache') !== false || strpos($_SERVER['SERVER_SOFTWARE'], 'LiteSpeed') !== false);
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Whether the server software is Nginx or something else
- * @global bool $is_nginx
- */
-$is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
-
</del><ins>+ * Whether the server software is Nginx or something else
+ * @global bool $is_nginx
+ */
+$is_nginx = (strpos($_SERVER['SERVER_SOFTWARE'], 'nginx') !== false);
+
</ins><span class="cx"> /**
</span><span class="cx"> * Whether the server software is IIS or something else
</span><span class="cx"> * @global bool $is_IIS
</span></span></pre></div>
<a id="branches37srcwploginphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/wp-login.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/wp-login.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/wp-login.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Fires when the login form is initialized.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.2.0
</span><span class="cx"> */
</span><span class="cx"> do_action( 'login_init' );
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx"> * The dynamic portion of the hook name, $action, refers to the action
</span><span class="cx"> * that brought the visitor to the login form. Actions include 'postpass',
</span><span class="cx"> * 'logout', 'lostpassword', etc.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> do_action( 'login_form_' . $action );
</span><span class="lines">@@ -574,7 +574,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Fires before the password reset procedure is validated.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param object $errors WP Error object.
</span></span></pre></div>
<a id="branches37srcxmlrpcphp"></a>
<div class="modfile"><h4>Modified: branches/3.7/src/xmlrpc.php (25880 => 25881)</h4>
<pre class="diff"><span>
<span class="info">--- branches/3.7/src/xmlrpc.php 2013-10-23 14:37:54 UTC (rev 25880)
+++ branches/3.7/src/xmlrpc.php 2013-10-23 14:39:36 UTC (rev 25881)
</span><span class="lines">@@ -42,14 +42,14 @@
</span><span class="cx"> <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
</span><span class="cx"> <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
</span><span class="cx"> <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
</span><del>- <?php
- /**
</del><ins>+ <?php
+ /**
</ins><span class="cx"> * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
</span><span class="cx"> *
</span><span class="cx"> * @see http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
</span><span class="cx"> * @since 3.5.0
</span><del>- */
- do_action( 'xmlrpc_rsd_apis' );
</del><ins>+ */
+ do_action( 'xmlrpc_rsd_apis' );
</ins><span class="cx"> ?>
</span><span class="cx"> </apis>
</span><span class="cx"> </service>
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> */
</span><span class="cx"> $post_default_title = "";
</span><span class="cx">
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Filter the class used for handling XML-RPC requests.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.1.0
</span><span class="cx"> * @param string The name of the XML-RPC server class.
</span><del>- */
</del><ins>+ */
</ins><span class="cx"> $wp_xmlrpc_server_class = apply_filters( 'wp_xmlrpc_server_class', 'wp_xmlrpc_server' );
</span><span class="cx"> $wp_xmlrpc_server = new $wp_xmlrpc_server_class;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>