<!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>[42228] trunk: General: Fix some precision alignment formatting warnings.</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/42228">42228</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42228","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-11-26 23:56:25 +0000 (Sun, 26 Nov 2017)</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'>General: Fix some precision alignment formatting warnings.
The WPCS `WordPress.WhiteSpace.PrecisionAlignment` rule throws warnings for a bunch of code that will likely cause issues for `wpcbf`. Fixing these manually beforehand gives us better auto-fixed results later.
See <a href="https://core.trac.wordpress.org/ticket/41057">#41057</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminaboutphp">trunk/src/wp-admin/about.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadmintermphp">trunk/src/wp-admin/term.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsfooterfooterwidgetsphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenfooterphp">trunk/src/wp-content/themes/twentysixteen/footer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteenheaderphp">trunk/src/wp-content/themes/twentysixteen/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytenheaderphp">trunk/src/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludesclasswppostphp">trunk/src/wp-includes/class-wp-post.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludesfeedatomphp">trunk/src/wp-includes/feed-atom.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatcommentsphp">trunk/src/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcxmlrpcphp">trunk/src/xmlrpc.php</a></li>
<li><a href="#trunktestsphpunitincludesbootstrapphp">trunk/tests/phpunit/includes/bootstrap.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalpageOnFrontphp">trunk/tests/phpunit/tests/canonical/pageOnFront.php</a></li>
<li><a href="#trunktestsphpunittestscommentgetCommentsPagesCountphp">trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</a></li>
<li><a href="#trunktestsphpunittestscommentlastCommentModifiedphp">trunk/tests/phpunit/tests/comment/lastCommentModified.php</a></li>
<li><a href="#trunktestsphpunittestscommentphp">trunk/tests/phpunit/tests/comment.php</a></li>
<li><a href="#trunktestsphpunittestscompatphp">trunk/tests/phpunit/tests/compat.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSmiliesphp">trunk/tests/phpunit/tests/formatting/Smilies.php</a></li>
<li><a href="#trunktestsphpunittestsformattingent2ncrphp">trunk/tests/phpunit/tests/formatting/ent2ncr.php</a></li>
<li><a href="#trunktestsphpunittestshttphttpphp">trunk/tests/phpunit/tests/http/http.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
<li><a href="#trunktestsphpunittestsimageresizephp">trunk/tests/phpunit/tests/image/resize.php</a></li>
<li><a href="#trunktestsphpunittestspostrevisionsphp">trunk/tests/phpunit/tests/post/revisions.php</a></li>
<li><a href="#trunktestsphpunittestsqueryresultsphp">trunk/tests/phpunit/tests/query/results.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpagescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostmetafieldsphp">trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpoststatusescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestposttypescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestrevisionscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestserverphp">trunk/tests/phpunit/tests/rest-api/rest-server.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermphp">trunk/tests/phpunit/tests/term/getTerm.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminaboutphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/about.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/about.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/about.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,15 +353,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: WordPress version number, 2: plural number of bugs. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<strong>Version %1$s</strong> addressed %2$s bugs.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<strong>Version %1$s</strong> addressed %2$s bugs.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
</span><span class="cx" style="display: block; padding: 0 10px"> _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Codex URL */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'For more information, see <a href="%s">the release notes</a>.' );
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/edit-comments.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( $redirect_to );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+ exit;
</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"> $wp_list_table->prepare_items();
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/edit-form-advanced.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,8 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type Post type.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_supports( $post_type, 'editor' ) && ! wp_is_mobile() &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
- apply_filters( 'wp_editor_expand', true, $post_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! ( $is_IE && preg_match( '/MSIE [5678]/', $_SERVER['HTTP_USER_AGENT'] ) ) &&
+ apply_filters( 'wp_editor_expand', true, $post_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script('editor-expand');
</span><span class="cx" style="display: block; padding: 0 10px"> $_content_editor_dfw = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,31 +144,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages['post'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0 => '', // Unused. Messages start at index 1.
- 1 => __( 'Post updated.' ) . $view_post_link_html,
- 2 => __( 'Custom field updated.' ),
- 3 => __( 'Custom field deleted.' ),
- 4 => __( 'Post updated.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0 => '', // Unused. Messages start at index 1.
+ 1 => __( 'Post updated.' ) . $view_post_link_html,
+ 2 => __( 'Custom field updated.' ),
+ 3 => __( 'Custom field deleted.' ),
+ 4 => __( 'Post updated.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: date and time of the revision */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
- 6 => __( 'Post published.' ) . $view_post_link_html,
- 7 => __( 'Post saved.' ),
- 8 => __( 'Post submitted.' ) . $preview_post_link_html,
- 9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5 => isset($_GET['revision']) ? sprintf( __( 'Post restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+ 6 => __( 'Post published.' ) . $view_post_link_html,
+ 7 => __( 'Post saved.' ),
+ 8 => __( 'Post submitted.' ) . $preview_post_link_html,
+ 9 => sprintf( __( 'Post scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_post_link_html,
</ins><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Post draft updated.' ) . $preview_post_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $messages['page'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0 => '', // Unused. Messages start at index 1.
- 1 => __( 'Page updated.' ) . $view_page_link_html,
- 2 => __( 'Custom field updated.' ),
- 3 => __( 'Custom field deleted.' ),
- 4 => __( 'Page updated.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0 => '', // Unused. Messages start at index 1.
+ 1 => __( 'Page updated.' ) . $view_page_link_html,
+ 2 => __( 'Custom field updated.' ),
+ 3 => __( 'Custom field deleted.' ),
+ 4 => __( 'Page updated.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: date and time of the revision */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
- 6 => __( 'Page published.' ) . $view_page_link_html,
- 7 => __( 'Page saved.' ),
- 8 => __( 'Page submitted.' ) . $preview_page_link_html,
- 9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 5 => isset($_GET['revision']) ? sprintf( __( 'Page restored to revision from %s.' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+ 6 => __( 'Page published.' ) . $view_page_link_html,
+ 7 => __( 'Page saved.' ),
+ 8 => __( 'Page submitted.' ) . $preview_page_link_html,
+ 9 => sprintf( __( 'Page scheduled for: %s.' ), '<strong>' . $scheduled_date . '</strong>' ) . $scheduled_page_link_html,
</ins><span class="cx" style="display: block; padding: 0 10px"> 10 => __( 'Page draft updated.' ) . $preview_page_link_html,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $messages['attachment'] = array_fill( 1, 10, __( 'Media file updated.' ) ); // Hack, for now.
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/edit-form-comment.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $html Output HTML to display miscellaneous action.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $comment Current comment object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo apply_filters( 'edit_comment_misc_actions', '', $comment );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo apply_filters( 'edit_comment_misc_actions', '', $comment );
</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"> </div> <!-- misc actions -->
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/edit-tags.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid taxonomy.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
</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"> if ( ! current_user_can( $tax->cap->manage_terms ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/edit.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,8 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect($sendback);
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty($_REQUEST['_wp_http_referer']) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ) );
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']) ) );
+ exit;
</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"> $wp_list_table->prepare_items();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['post'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s post updated.', '%s posts updated.', $bulk_counts['updated'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 post not updated, somebody is editing it.' ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,7 +280,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $bulk_messages['page'] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'locked' => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'deleted' => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,10 +176,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $force_gzip = ( defined('ENFORCE_GZIP') && ENFORCE_GZIP );
</span><span class="cx" style="display: block; padding: 0 10px"> $test_str = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis li
bero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."';
</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 ( 1 == $_GET['test'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $_GET['test'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $test_str;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 2 == $_GET['test'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 2 == $_GET['test'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesbookmarkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/bookmark.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,8 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = wp_slash( $link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Passed link category list overwrites existing category list if not empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
- && 0 != count( $linkdata['link_category'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] ) && 0 != count( $linkdata['link_category'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_cats = $linkdata['link_category'];
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $link_cats = $link['link_category'];
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,9 +382,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attarray = preg_split('//', $mode);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ($key = array_search($attarray[$i], $legal)) {
- $realmode .= $legal[$key];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ($key = array_search($attarray[$i], $legal)) {
+ $realmode .= $legal[$key];
+ }
</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"> $mode = str_pad($realmode, 10, '-', STR_PAD_LEFT);
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +408,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'f' == $type || $this->is_file($file) )
</span><span class="cx" style="display: block; padding: 0 10px"> return ssh2_sftp_unlink($this->sftp_link, $file);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursive )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ssh2_sftp_rmdir($this->sftp_link, $file);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ssh2_sftp_rmdir($this->sftp_link, $file);
</ins><span class="cx" style="display: block; padding: 0 10px"> $filelist = $this->dirlist($file);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array($filelist) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $filelist as $filename => $fileinfo) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -636,7 +636,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // end if $is_active
</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 if $screen->in_admin( 'network' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } // end if $screen->in_admin( 'network' )
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } // end if $context
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +233,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class_html = $aria_current = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $class ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_html = sprintf(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_html = sprintf(
</ins><span class="cx" style="display: block; padding: 0 10px"> ' class="%s"',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $class )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/dashboard.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,7 +403,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $actions ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul class="subsubsub">';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $class => $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions[ $class ] = "\t<li class='$class'>$action";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions[ $class ] = "\t<li class='$class'>$action";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo implode( " |</li>\n", $actions ) . "</li>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</ul>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/image.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $iptc['2#025'][0] ) ) { // keywords array
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['keywords'] = array_values( $iptc['2#025'] );
</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"> }
</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="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/media.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1509,12 +1509,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( !MEDIA_TRASH ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
- /* translators: %s: file name */
- '<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
- <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
- <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
- </div>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
+ /* translators: %s: file name */
+ '<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
+ <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
+ <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
+ </div>";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href='" . wp_nonce_url( "post.php?action=untrash&post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2671,7 +2671,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function media_upload_html_bypass() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="upload-html-bypass hide-if-no-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e('You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php _e('You are using the browser’s built-in file uploader. The WordPress uploader includes multiple file selection and drag and drop capability. <a href="#">Switch to the multi-file uploader</a>.'); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a>
+<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,8 +180,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
- <a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a>
+ <a href="#visibility" class="cancel-post-visibility hide-if-no-js button-cancel"><?php _e('Cancel'); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/plugin-install.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,8 +628,10 @@
</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"> <div class="counter-container">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span class="counter-label"><a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
- target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a></span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span class="counter-label">
+ <a href="https://wordpress.org/support/view/plugin-reviews/<?php echo $api->slug; ?>?filter=<?php echo $key; ?>"
+ target="_blank" aria-label="<?php echo $aria_label; ?>"><?php printf( _n( '%d star', '%d stars', $key ), $key ); ?></a>
+ </span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="counter-back">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="counter-bar" style="width: <?php echo 92 * $_rating; ?>px;"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/post.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,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"> if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_data['post_type'] )
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/schema.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -380,10 +380,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_string = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $gmt_offset = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
- or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php
- for all timezone strings supported by PHP.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * translators: default GMT offset or timezone string. Must be either a valid offset (-12 to 14)
+ * or a valid timezone string (America/New_York). See https://secure.php.net/manual/en/timezones.php
+ * for all timezone strings supported by PHP.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> $offset_or_tz = _x( '0', 'default GMT offset or timezone string' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $offset_or_tz ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $gmt_offset = $offset_or_tz;
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/upgrade.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -884,7 +884,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'post_status' => 'attachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => $object->post_type,
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => ''),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'ID' => $object->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'ID' => $object->ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta = get_post_meta($object->ID, 'imagedata', true);
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty($meta['file']) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2249,7 +2249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Extract type, name and columns from the definition.
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match(
</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"> . '(?P<index_type>' // 1) Type of the index.
</span><span class="cx" style="display: block; padding: 0 10px"> . 'PRIMARY\s+KEY|(?:UNIQUE|FULLTEXT|SPATIAL)\s+(?:KEY|INDEX)|KEY|INDEX'
</span><span class="cx" style="display: block; padding: 0 10px"> . ')'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2288,7 +2288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $index_columns as $id => &$index_column ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Extract column name and number of indexed characters (sub_part).
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match(
</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"> . '`?' // Name can be escaped with a backtick.
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?P<column_name>' // 1) Name of the column.
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:[0-9a-zA-Z$_-]|[\xC2-\xDF][\x80-\xBF])+'
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/includes/user.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,14 +200,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notify = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
</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">- * Fires after a new user has been created.
- *
- * @since 4.4.0
- *
- * @param int $user_id ID of the newly created user.
- * @param string $notify Type of notification that should happen. See wp_send_new_user_notifications()
- * for more information on possible values.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a new user has been created.
+ *
+ * @since 4.4.0
+ *
+ * @param int $user_id ID of the newly created user.
+ * @param string $notify Type of notification that should happen. See wp_send_new_user_notifications()
+ * for more information on possible values.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'edit_user_created_user', $user_id, $notify );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $user_id;
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/install.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/options-reading.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'blog_privacy_selector' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="0" <?php checked( 0, $blog_public ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Discourage search engines from indexing this site' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description"><?php _e( 'It is up to search engines to honor this request.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/link-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/link-manager.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,8 +37,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $redirect_to );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+ exit;
</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"> $wp_list_table->prepare_items();
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/network/site-new.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,12 +119,12 @@
</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">- * Fires after a new user has been created via the network site-new.php page.
- *
- * @since 4.4.0
- *
- * @param int $user_id ID of the newly created user.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a new user has been created via the network site-new.php page.
+ *
+ * @since 4.4.0
+ *
+ * @param int $user_id ID of the newly created user.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'network_site_new_created_user', $user_id );
</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="trunksrcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/network/site-users.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,12 +73,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $update = 'newuser';
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires after a user has been created via the network site-users.php page.
- *
- * @since 4.4.0
- *
- * @param int $user_id ID of the newly created user.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a user has been created via the network site-users.php page.
+ *
+ * @since 4.4.0
+ *
+ * @param int $user_id ID of the newly created user.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'network_site_users_created_user', $user_id );
</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="trunksrcwpadminnetworkusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/user-new.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/network/user-new.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,12 +49,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires after a new user has been created via the network user-new.php page.
- *
- * @since 4.4.0
- *
- * @param int $user_id ID of the newly created user.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires after a new user has been created via the network user-new.php page.
+ *
+ * @since 4.4.0
+ *
+ * @param int $user_id ID of the newly created user.
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> do_action( 'network_user_new_created_user', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/options-permalink.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_settings_sections('permalink'); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </form>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</form>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( !is_multisite() ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $iis7_permalinks ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/options.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,12 +244,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wrap">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1><?php esc_html_e( 'All Settings' ); ?></h1>
- <form name="form" action="options.php" method="post" id="all-options">
- <?php wp_nonce_field('options-options') ?>
- <input type="hidden" name="action" value="update" />
- <input type="hidden" name="option_page" value="options" />
- <table class="form-table">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1><?php esc_html_e( 'All Settings' ); ?></h1>
+ <form name="form" action="options.php" method="post" id="all-options">
+ <?php wp_nonce_field('options-options') ?>
+ <input type="hidden" name="action" value="update" />
+ <input type="hidden" name="option_page" value="options" />
+ <table class="form-table">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,13 +287,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </table>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</table>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Save Changes' ), 'primary', 'Update' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </form>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</form>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/post.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,8 +45,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sendback ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $sendback, 'post.php' ) !== false ||
- strpos( $sendback, 'post-new.php' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ strpos( $sendback, 'post.php' ) !== false ||
+ strpos( $sendback, 'post-new.php' ) !== false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' == $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'upload.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadmintermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/term.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/term.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,8 +31,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $tax->labels->edit_item;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! current_user_can( 'edit_term', $tag->term_id )
-) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! current_user_can( 'edit_term', $tag->term_id ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'Cheatin’ uh?' ) . '</h1>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/theme-editor.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'If you decide to go ahead with direct edits anyway, use a file manager to create a copy with a new name and hang on to the original. That way, you can re-enable a functional version if something goes wrong.' ); ?></p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <a class="button file-editor-warning-go-back" href="<?php echo esc_url( $return_url ); ?>"><?php _e( 'Go back' ); ?></a>
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/upload.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,8 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $location );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
- exit;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+ exit;
</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"> $wp_list_table->prepare_items();
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-admin/users.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'overview',
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __('Overview'),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' => '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>'
</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"> get_current_screen()->add_help_tab( array(
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/functions.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-content/themes/twentyseventeen/functions.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,7 +484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_active_sidebar( 'sidebar-1' ) || is_archive() || is_search() || is_home() || is_page() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( is_page() && 'one-column' === get_theme_mod( 'page_options' ) ) && 767 <= $width ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sizes = '(max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sizes = '(max-width: 767px) 89vw, (max-width: 1000px) 54vw, (max-width: 1071px) 543px, 580px';
</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="trunksrcwpcontentthemestwentyseventeentemplatepartsfooterfooterwidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/footer/footer-widgets.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_active_sidebar( 'sidebar-2' ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- is_active_sidebar( 'sidebar-3' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ is_active_sidebar( 'sidebar-3' ) ) :
</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"> <aside class="widget-area" role="complementary" aria-label="<?php esc_attr_e( 'Footer', 'twentyseventeen' ); ?>">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteenfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/footer.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-content/themes/twentysixteen/footer.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_location' => 'primary',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_class' => 'primary-menu',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .main-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentysixteen/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentysixteen/header.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-content/themes/twentysixteen/header.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nav_menu( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_location' => 'primary',
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_class' => 'primary-menu',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- .main-navigation -->
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/header.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-content/themes/twentyten/header.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- #branding -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="access" role="navigation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php /* Allow screen readers / text browsers to skip the navigation menu and get right to the good stuff */ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="skip-link screen-reader-text"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'twentyten' ); ?>"><?php _e( 'Skip to content', 'twentyten' ); ?></a></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* Our navigation menu. If one isn't filled out, wp_nav_menu falls back to wp_page_menu. The menu assiged to the primary position is the one used. If none is assigned, the menu with the lowest ID is used. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +44,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // On some setups GD library does not provide imagerotate() - Ticket #11536
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['methods'] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- in_array( 'rotate', $args['methods'] ) &&
- ! function_exists('imagerotate') ){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ in_array( 'rotate', $args['methods'] ) &&
+ ! function_exists('imagerotate') ){
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswppostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp-post.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,10 +283,10 @@
</span><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"> if ( 'post_category' == $key )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'tags_input' == $key )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return metadata_exists( 'post', $this->ID, $key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp-query.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -423,7 +423,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.2.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $thumbnails_cached = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $thumbnails_cached = false;
</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"> * Cached list of search stopwords.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1805,7 +1805,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match("/^[^%]*%(?:postname|category|tag|author)%/", $this->permalink_structure) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->use_verbose_page_rules = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->use_verbose_page_rules = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $this->use_verbose_page_rules = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-walker.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp-walker.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -251,9 +251,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_elements as $orphans )
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orphans as $op )
</span><span class="cx" style="display: block; padding: 0 10px"> $this->display_element( $op, $empty_array, 1, 0, $args, $output );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $output;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $output;
</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="trunksrcwpincludesclasswpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/class-wp.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,16 +410,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We're showing a feed, so WP is indeed the only thing that last changed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['withcomments'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || false !== strpos( $this->query_vars['feed'], 'comments-' )
- || ( empty( $this->query_vars['withoutcomments'] )
- && ( ! empty( $this->query_vars['p'] )
- || ! empty( $this->query_vars['name'] )
- || ! empty( $this->query_vars['page_id'] )
- || ! empty( $this->query_vars['pagename'] )
- || ! empty( $this->query_vars['attachment'] )
- || ! empty( $this->query_vars['attachment_id'] )
- )
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || false !== strpos( $this->query_vars['feed'], 'comments-' )
+ || ( empty( $this->query_vars['withoutcomments'] )
+ && ( ! empty( $this->query_vars['p'] )
+ || ! empty( $this->query_vars['name'] )
+ || ! empty( $this->query_vars['page_id'] )
+ || ! empty( $this->query_vars['pagename'] )
+ || ! empty( $this->query_vars['attachment'] )
+ || ! empty( $this->query_vars['attachment_id'] )
+ )
+ )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_last_modified = mysql2date( 'D, d M Y H:i:s', get_lastcommentmodified( 'GMT' ), false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,8 +449,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_modified_timestamp = strtotime($wp_last_modified);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ($client_last_modified && $client_etag) ?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
- (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (($client_modified_timestamp >= $wp_modified_timestamp) && ($client_etag == $wp_etag)) :
+ (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 304;
</span><span class="cx" style="display: block; padding: 0 10px"> $exit_required = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/comment-template.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2219,20 +2219,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/link-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_log_in' => '<p class="must-log-in">' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: login URL */
- __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
- wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: %s: login URL */
+ __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
+ wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '</p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/link-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> 'logged_in_as' => '<p class="logged-in-as">' . sprintf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
- __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
- get_edit_user_link(),
- /* translators: %s: user name */
- esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
- $user_identity,
- wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
- ) . '</p>',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+ __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+ get_edit_user_link(),
+ /* translators: %s: user name */
+ esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+ $user_identity,
+ wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ), $post_id ) )
+ ) . '</p>',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_notes_after' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => site_url( '/wp-comments-post.php' ),
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/comment.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1209,15 +1209,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $word = preg_quote($word, '#');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = "#$word#i";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (
- preg_match($pattern, $author)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match($pattern, $author)
</ins><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $email)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $url)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $comment)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $comment_without_html)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $user_ip)
</span><span class="cx" style="display: block; padding: 0 10px"> || preg_match($pattern, $user_agent)
</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"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/compat.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,9 +472,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $head ) as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $key, $bref ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
- isset( $head[ $key ] ) && is_array( $head[ $key ] )
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
+ isset( $head[ $key ] ) && is_array( $head[ $key ] ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $bref_stack[] = &$bref[ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> $head_stack[] = $head[ $key ];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesfeedatomphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/feed-atom.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,19 +14,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'rss_tag_pre', 'atom' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <feed
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xmlns="http://www.w3.org/2005/Atom"
- xmlns:thr="http://purl.org/syndication/thread/1.0"
- xml:lang="<?php bloginfo_rss( 'language' ); ?>"
- xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
- <?php
- /**
- * Fires at end of the Atom feed root to add namespaces.
- *
- * @since 2.0.0
- */
- do_action( 'atom_ns' );
- ?>
- >
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ xmlns="http://www.w3.org/2005/Atom"
+ xmlns:thr="http://purl.org/syndication/thread/1.0"
+ xml:lang="<?php bloginfo_rss( 'language' ); ?>"
+ xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
+ <?php
+ /**
+ * Fires at end of the Atom feed root to add namespaces.
+ *
+ * @since 2.0.0
+ */
+ do_action( 'atom_ns' );
+ ?>
+>
</ins><span class="cx" style="display: block; padding: 0 10px"> <title type="text"><?php wp_title_rss(); ?></title>
</span><span class="cx" style="display: block; padding: 0 10px"> <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/formatting.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,7 +618,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $regex ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!' // Start of comment, after the <.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!' // Start of comment, after the <.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '(?:' // Unroll the loop: Consume everything until --> is found.
</span><span class="cx" style="display: block; padding: 0 10px"> . '-(?!->)' // Dash not followed by end of comment.
</span><span class="cx" style="display: block; padding: 0 10px"> . '[^\-]*+' // Consume non-dashes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,7 +626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:-->)?'; // End of comment. If not found, match all input.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cdata =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!\[CDATA\[' // Start of comment, after the <.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!\[CDATA\[' // Start of comment, after the <.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '[^\]]*+' // Consume non-].
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:' // Unroll the loop: Consume everything until ]]> is found.
</span><span class="cx" style="display: block; padding: 0 10px"> . '](?!]>)' // One ] not followed by end of comment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:]]>)?'; // End of comment. If not found, match all input.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $escaped =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '(?=' // Is the element escaped?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '(?=' // Is the element escaped?
</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"> . '!\[CDATA\['
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -647,7 +647,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"> $regex =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '/(' // Capture the entire match.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '/(' // Capture the entire match.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '<' // Find start of element.
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?' // Conditional expression follows.
</span><span class="cx" style="display: block; padding: 0 10px"> . $escaped // Find end of escaped element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,7 +678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $html_regex ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_regex =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '!' // Start of comment, after the <.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '!' // Start of comment, after the <.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '(?:' // Unroll the loop: Consume everything until --> is found.
</span><span class="cx" style="display: block; padding: 0 10px"> . '-(?!->)' // Dash not followed by end of comment.
</span><span class="cx" style="display: block; padding: 0 10px"> . '[^\-]*+' // Consume non-dashes.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,7 +686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:-->)?'; // End of comment. If not found, match all input.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<' // Find start of element.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<' // Find start of element.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '(?(?=!--)' // Is this a comment?
</span><span class="cx" style="display: block; padding: 0 10px"> . $comment_regex // Find end of comment.
</span><span class="cx" style="display: block; padding: 0 10px"> . '|'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
</span><span class="cx" style="display: block; padding: 0 10px"> $regex =
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '\[' // Find start of shortcode.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '\[' // Find start of shortcode.
</ins><span class="cx" style="display: block; padding: 0 10px"> . '[\/\[]?' // Shortcodes may begin with [/ or [[
</span><span class="cx" style="display: block; padding: 0 10px"> . $tagregexp // Only match registered shortcodes, because performance.
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:'
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -818,7 +818,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $spaces = wp_spaces_regexp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern =
</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"> . '<p>' // Opening paragraph
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?:' . $spaces . ')*+' // Optional leading whitespace
</span><span class="cx" style="display: block; padding: 0 10px"> . '(' // 1: The shortcode
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2751,8 +2751,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = 'nofollow';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return "<a $text>";
</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="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/functions.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3383,48 +3383,48 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ':mrgreen:' => 'mrgreen.png',
</span><span class="cx" style="display: block; padding: 0 10px"> ':neutral:' => "\xf0\x9f\x98\x90",
</span><span class="cx" style="display: block; padding: 0 10px"> ':twisted:' => "\xf0\x9f\x98\x88",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':arrow:' => "\xe2\x9e\xa1",
- ':shock:' => "\xf0\x9f\x98\xaf",
- ':smile:' => "\xf0\x9f\x99\x82",
- ':???:' => "\xf0\x9f\x98\x95",
- ':cool:' => "\xf0\x9f\x98\x8e",
- ':evil:' => "\xf0\x9f\x91\xbf",
- ':grin:' => "\xf0\x9f\x98\x80",
- ':idea:' => "\xf0\x9f\x92\xa1",
- ':oops:' => "\xf0\x9f\x98\xb3",
- ':razz:' => "\xf0\x9f\x98\x9b",
- ':roll:' => "\xf0\x9f\x99\x84",
- ':wink:' => "\xf0\x9f\x98\x89",
- ':cry:' => "\xf0\x9f\x98\xa5",
- ':eek:' => "\xf0\x9f\x98\xae",
- ':lol:' => "\xf0\x9f\x98\x86",
- ':mad:' => "\xf0\x9f\x98\xa1",
- ':sad:' => "\xf0\x9f\x99\x81",
- '8-)' => "\xf0\x9f\x98\x8e",
- '8-O' => "\xf0\x9f\x98\xaf",
- ':-(' => "\xf0\x9f\x99\x81",
- ':-)' => "\xf0\x9f\x99\x82",
- ':-?' => "\xf0\x9f\x98\x95",
- ':-D' => "\xf0\x9f\x98\x80",
- ':-P' => "\xf0\x9f\x98\x9b",
- ':-o' => "\xf0\x9f\x98\xae",
- ':-x' => "\xf0\x9f\x98\xa1",
- ':-|' => "\xf0\x9f\x98\x90",
- ';-)' => "\xf0\x9f\x98\x89",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':arrow:' => "\xe2\x9e\xa1",
+ ':shock:' => "\xf0\x9f\x98\xaf",
+ ':smile:' => "\xf0\x9f\x99\x82",
+ ':???:' => "\xf0\x9f\x98\x95",
+ ':cool:' => "\xf0\x9f\x98\x8e",
+ ':evil:' => "\xf0\x9f\x91\xbf",
+ ':grin:' => "\xf0\x9f\x98\x80",
+ ':idea:' => "\xf0\x9f\x92\xa1",
+ ':oops:' => "\xf0\x9f\x98\xb3",
+ ':razz:' => "\xf0\x9f\x98\x9b",
+ ':roll:' => "\xf0\x9f\x99\x84",
+ ':wink:' => "\xf0\x9f\x98\x89",
+ ':cry:' => "\xf0\x9f\x98\xa5",
+ ':eek:' => "\xf0\x9f\x98\xae",
+ ':lol:' => "\xf0\x9f\x98\x86",
+ ':mad:' => "\xf0\x9f\x98\xa1",
+ ':sad:' => "\xf0\x9f\x99\x81",
+ '8-)' => "\xf0\x9f\x98\x8e",
+ '8-O' => "\xf0\x9f\x98\xaf",
+ ':-(' => "\xf0\x9f\x99\x81",
+ ':-)' => "\xf0\x9f\x99\x82",
+ ':-?' => "\xf0\x9f\x98\x95",
+ ':-D' => "\xf0\x9f\x98\x80",
+ ':-P' => "\xf0\x9f\x98\x9b",
+ ':-o' => "\xf0\x9f\x98\xae",
+ ':-x' => "\xf0\x9f\x98\xa1",
+ ':-|' => "\xf0\x9f\x98\x90",
+ ';-)' => "\xf0\x9f\x98\x89",
</ins><span class="cx" style="display: block; padding: 0 10px"> // This one transformation breaks regular text with frequency.
</span><span class="cx" style="display: block; padding: 0 10px"> // '8)' => "\xf0\x9f\x98\x8e",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '8O' => "\xf0\x9f\x98\xaf",
- ':(' => "\xf0\x9f\x99\x81",
- ':)' => "\xf0\x9f\x99\x82",
- ':?' => "\xf0\x9f\x98\x95",
- ':D' => "\xf0\x9f\x98\x80",
- ':P' => "\xf0\x9f\x98\x9b",
- ':o' => "\xf0\x9f\x98\xae",
- ':x' => "\xf0\x9f\x98\xa1",
- ':|' => "\xf0\x9f\x98\x90",
- ';)' => "\xf0\x9f\x98\x89",
- ':!:' => "\xe2\x9d\x97",
- ':?:' => "\xe2\x9d\x93",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '8O' => "\xf0\x9f\x98\xaf",
+ ':(' => "\xf0\x9f\x99\x81",
+ ':)' => "\xf0\x9f\x99\x82",
+ ':?' => "\xf0\x9f\x98\x95",
+ ':D' => "\xf0\x9f\x98\x80",
+ ':P' => "\xf0\x9f\x98\x9b",
+ ':o' => "\xf0\x9f\x98\xae",
+ ':x' => "\xf0\x9f\x98\xa1",
+ ':|' => "\xf0\x9f\x98\x90",
+ ';)' => "\xf0\x9f\x98\x89",
+ ':!:' => "\xe2\x9d\x97",
+ ':?:' => "\xe2\x9d\x93",
</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="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/general-template.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2948,8 +2948,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $attr => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_scalar( $value ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr )) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/kses.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1094,7 +1094,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"> $regex =
</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"> . '[-a-zA-Z:]+' // Attribute name.
</span><span class="cx" style="display: block; padding: 0 10px"> . '|'
</span><span class="cx" style="display: block; padding: 0 10px"> . '\[\[?[^\[\]]+\]\]?' // Shortcode in the name position implies unfiltered_html.
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/link-template.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1990,7 +1990,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $taxonomy Optional. Taxonomy, if $in_same_term is true. Default 'category'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function next_post_link( $format = '%link »', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
</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="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/media.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2973,7 +2973,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"> if ( isset( $args['methods'] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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">@@ -3500,9 +3501,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'replace' => __( 'Replace' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'remove' => __( 'Remove' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'back' => __( 'Back' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: This is a would-be plural string used in the media manager.
- If there is not a word you can use in your language to avoid issues with the
- lack of plural support here, turn it into "selected: %d" then translate it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * translators: This is a would-be plural string used in the media manager.
+ * If there is not a word you can use in your language to avoid issues with the
+ * lack of plural support here, turn it into "selected: %d" then translate it.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> 'selected' => __( '%d selected' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dragInfo' => __( 'Drag and drop to reorder media files.' ),
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/nav-menu.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Associate the menu item with the menu term
</span><span class="cx" style="display: block; padding: 0 10px"> // Only set the menu term if it isn't set to avoid unnecessary wp_get_object_terms()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $menu_id && ( ! $update || ! is_object_in_term( $menu_item_db_id, 'nav_menu', (int) $menu->term_id ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
</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="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/option.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_add( $option, $value, 'options' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // option does not exist, so we must cache its non-existence
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $notoptions ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $notoptions = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $notoptions = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $notoptions[$option] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'notoptions', $notoptions, 'options' );
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/post.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3630,14 +3630,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Passed post category list overwrites existing category list if not empty.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && 0 != count($postarr['post_category']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && 0 != count($postarr['post_category']) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_cats = $postarr['post_category'];
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $post_cats = $post['post_category'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Drafts shouldn't be assigned a date unless explicitly done so by the user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $clear_date = true;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $clear_date = false;
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/revision.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,12 +596,12 @@
</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"> if ( empty( $_REQUEST['_thumbnail_id'] ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- empty( $_REQUEST['preview_id'] ) ||
- $post->ID != $post_id ||
- '_thumbnail_id' != $meta_key ||
- 'revision' == $post->post_type ||
- $post_id != $_REQUEST['preview_id']
- ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ empty( $_REQUEST['preview_id'] ) ||
+ $post->ID != $post_id ||
+ '_thumbnail_id' != $meta_key ||
+ 'revision' == $post->post_type ||
+ $post_id != $_REQUEST['preview_id'] ) {
+
</ins><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></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/shortcodes.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
</span><span class="cx" style="display: block; padding: 0 10px"> // Also, see shortcode_unautop() and shortcode.js.
</span><span class="cx" style="display: block; padding: 0 10px"> return
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '\\[' // Opening bracket
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '\\[' // Opening bracket
</ins><span class="cx" style="display: block; padding: 0 10px"> . '(\\[?)' // 1: Optional second opening bracket for escaping shortcodes: [[tag]]
</span><span class="cx" style="display: block; padding: 0 10px"> . "($tagregexp)" // 2: Shortcode name
</span><span class="cx" style="display: block; padding: 0 10px"> . '(?![\\w-])' // Not followed by word character or hyphen
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-compat/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/theme-compat/comments.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,12 +56,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignleft"><?php previous_comments_link() ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="alignright"><?php next_comments_link() ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php else : // this is displayed if there are no comments so far ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php else : // this is displayed if there are no comments so far ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( comments_open() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <!-- If comments are open, but there are no comments. -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php else : // comments are closed ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php else : // comments are closed ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <!-- If comments are closed. -->
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="nocomments"><?php _e('Comments are closed.'); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/wp-includes/wp-db.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @var string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public $base_prefix;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public $base_prefix;
</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"> * Whether the database queries are ready to start executing.
</span></span></pre></div>
<a id="trunksrcxmlrpcphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/xmlrpc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/xmlrpc.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/src/xmlrpc.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,27 +33,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <service>
- <engineName>WordPress</engineName>
- <engineLink>https://wordpress.org/</engineLink>
- <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
- <apis>
- <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
- <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
- <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
- <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
- <?php
- /**
- * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
- *
- * @link http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
- *
- * @since 3.5.0
- */
- do_action( 'xmlrpc_rsd_apis' );
- ?>
- </apis>
- </service>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <service>
+ <engineName>WordPress</engineName>
+ <engineLink>https://wordpress.org/</engineLink>
+ <homePageLink><?php bloginfo_rss('url') ?></homePageLink>
+ <apis>
+ <api name="WordPress" blogID="1" preferred="true" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
+ <api name="Movable Type" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
+ <api name="MetaWeblog" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
+ <api name="Blogger" blogID="1" preferred="false" apiLink="<?php echo site_url('xmlrpc.php', 'rpc') ?>" />
+ <?php
+ /**
+ * Add additional APIs to the Really Simple Discovery (RSD) endpoint.
+ *
+ * @link http://cyber.law.harvard.edu/blogs/gems/tech/rsd.html
+ *
+ * @since 3.5.0
+ */
+ do_action( 'xmlrpc_rsd_apis' );
+ ?>
+ </apis>
+ </service>
</ins><span class="cx" style="display: block; padding: 0 10px"> </rsd>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span></span></pre></div>
<a id="trunktestsphpunitincludesbootstrapphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/bootstrap.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/bootstrap.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/includes/bootstrap.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,8 +129,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> class WP_PHPUnit_Util_Getopt extends PHPUnit_Util_Getopt {
</span><span class="cx" style="display: block; padding: 0 10px"> protected $longOptions = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'exclude-group=',
- 'group=',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'exclude-group=',
+ 'group=',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> function __construct( $argv ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $argv );
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpageOnFrontphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/canonical/pageOnFront.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/pageOnFront.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/canonical/pageOnFront.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * (string) expected redirect location
</span><span class="cx" style="display: block; padding: 0 10px"> * [3]: (optional) The ticket the test refers to, Can be skipped if unknown.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return array(
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check against an odd redirect
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/page/2/', '/page/2/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?page=2', '/page/2/' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/front-page/2/', '/page/2/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/front-page/?page=2', '/page/2/' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/blog-page/?paged=2', '/blog-page/page/2/' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscommentgetCommentsPagesCountphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/comment/getCommentsPagesCount.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Validate max_num_comment_pages logic of get_comment_pages_count
</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 test_max_num_comment_pages() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function test_max_num_comment_pages() {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wp_query;
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query = new WP_Query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,5 +144,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 0, get_comment_pages_count( array(), null, null ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->max_num_comment_pages = $org_max_num_comment_pages;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscommentlastCommentModifiedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment/lastCommentModified.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment/lastCommentModified.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/comment/lastCommentModified.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( wp_cache_get( 'lastcommentmodified:server', 'timeinfo' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( strtotime( '2000-01-02 10:00:00' ), strtotime( get_lastcommentmodified() ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( strtotime( '2000-01-02 10:00:00' ), strtotime( wp_cache_get( 'lastcommentmodified:server', 'timeinfo' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( strtotime( '2000-01-02 10:00:00' ), strtotime( wp_cache_get( 'lastcommentmodified:server', 'timeinfo' ) ) );
</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"> public function test_cache_is_cleared_when_comment_is_trashed() {
</span></span></pre></div>
<a id="trunktestsphpunittestscommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/comment.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,10 +616,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if a notification email was sent to the post author `test@test.com`.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['phpmailer']->mock_sent ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! empty( $GLOBALS['phpmailer']->mock_sent ) &&
- 'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
- $email_sent_when_comment_added = true;
- reset_phpmailer_instance();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! empty( $GLOBALS['phpmailer']->mock_sent ) &&
+ 'test@test.com' == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] ) {
+ $email_sent_when_comment_added = true;
+ reset_phpmailer_instance();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $email_sent_when_comment_added = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/compat.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/compat.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,38 +98,38 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $heredoc = <<<EOT
</span><span class="cx" style="display: block; padding: 0 10px"> hello world
</span><span class="cx" style="display: block; padding: 0 10px"> EOT;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $inputs = array(
- /*1*/ 0,
- 1,
- 12345,
- -2345,
- // float data
- /*5*/ 10.5,
- -10.5,
- 12.3456789000e10,
- 12.3456789000E-10,
- .5,
- // null data
- /*10*/ NULL,
- null,
- // boolean data
- /*12*/ true,
- false,
- TRUE,
- FALSE,
- // empty data
- /*16*/ "",
- '',
- // string data
- /*18*/ "string",
- 'string',
- $heredoc,
- // object data
- /*21*/ new classA(),
- // undefined data
- /*22*/ @$undefined_var,
- // unset data
- /*23*/ @$unset_var,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $inputs = array(
+ 0,
+ 1,
+ 12345,
+ -2345,
+ // float data
+ 10.5,
+ -10.5,
+ 12.3456789000e10,
+ 12.3456789000E-10,
+ .5,
+ // null data
+ NULL,
+ null,
+ // boolean data
+ true,
+ false,
+ TRUE,
+ FALSE,
+ // empty data
+ "",
+ '',
+ // string data
+ "string",
+ 'string',
+ $heredoc,
+ // object data
+ new classA(),
+ // undefined data
+ @$undefined_var,
+ // unset data
+ @$unset_var,
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $outputs = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "0",
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSmiliesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/Smilies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Smilies.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/formatting/Smilies.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,10 +104,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $trans_orig = $wpsmiliestrans; // save original translations array
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpsmiliestrans = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':PP' => 'icon_tongue.gif',
- ':arrow:' => 'icon_arrow.gif',
- ':monkey:' => 'icon_shock_the_monkey.gif',
- ':nervou:' => 'icon_nervou.gif'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':PP' => 'icon_tongue.gif',
+ ':arrow:' => 'icon_arrow.gif',
+ ':monkey:' => 'icon_shock_the_monkey.gif',
+ ':nervou:' => 'icon_nervou.gif'
</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"> smilies_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_trans = $wpsmiliestrans; // save original tranlations array
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpsmiliestrans = array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ':)' => 'simple-smile.png'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ':)' => 'simple-smile.png'
</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"> smilies_init();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,13 +346,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _filter_remove_smilies( $wpsmiliestrans ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _filter_remove_smilies( $wpsmiliestrans ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $wpsmiliestrans[':oops:'] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $wpsmiliestrans;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function _filter_add_smilies( $wpsmiliestrans ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function _filter_add_smilies( $wpsmiliestrans ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpsmiliestrans['<3'] = '\xe2\x9d\xa4';
</span><span class="cx" style="display: block; padding: 0 10px"> return $wpsmiliestrans;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingent2ncrphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/ent2ncr.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/ent2ncr.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/formatting/ent2ncr.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,9 +14,9 @@
</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">- Get test data from files, one test per line.
- Comments start with "###".
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get test data from files, one test per line.
+ * Comments start with "###".
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> function entities() {
</span><span class="cx" style="display: block; padding: 0 10px"> $entities = file( DIR_TESTDATA . '/formatting/entities.txt' );
</span><span class="cx" style="display: block; padding: 0 10px"> $data_provided = array();
</span></span></pre></div>
<a id="trunktestsphpunittestshttphttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/http/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/http/http.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/http/http.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,10 +127,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 123, array( 'path' => '123' ) ),
</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">- Untestable edge cases in various PHP:
- - ///example.com - Fails in PHP >= 5.4.7, assumed path in <5.4.7
- - ://example.com - assumed path in PHP >= 5.4.7, fails in <5.4.7
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Untestable edge cases in various PHP:
+ * - ///example.com - Fails in PHP >= 5.4.7, assumed path in <5.4.7
+ * - ://example.com - assumed path in PHP >= 5.4.7, fails in <5.4.7
+ */
</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="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/image/functions.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->fail( 'jpeg support unavailable' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image( DIR_TESTDATA . '/images/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0, 0, 100, 100, 100, 100 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,8 +312,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"> $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100, false,
- DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0, 0, 100, 100, 100, 100, false,
+ DIR_TESTDATA . '/images/' . __FUNCTION__ . '.jpg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFileExists( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_crop_image_file_not_exist() {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image( DIR_TESTDATA . '/images/canoladoesnotexist.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0, 0, 100, 100, 100, 100 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</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">@@ -336,7 +336,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"> $file = wp_crop_image( 'https://asdftestblog1.files.wordpress.com/2008/04/canoladoesnotexist.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0, 0, 100, 100, 100, 100 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</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">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_crop_image( DIR_TESTDATA . '/images/canola.jpg',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 0, 0, 100, 100, 100, 100 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 0, 0, 100, 100, 100, 100 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> remove_filter( 'wp_image_editors', array( $this, 'mock_image_editor' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestsimageresizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/resize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resize.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/image/resize.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $editor;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $resized = $editor->resize( $width, $height, $crop );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $resized ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $resized ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $resized;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $dest_file = $editor->generate_filename();
</span></span></pre></div>
<a id="trunktestsphpunittestspostrevisionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/revisions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/revisions.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/post/revisions.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,12 +165,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertCount( 1, $revisions );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'edit_post', $revision->post_parent ) );
</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"> // Author shouldn't be able to restore the revisions
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertFalse( user_can( self::$author_user_id, 'edit_post', $revision->post_parent ) );
</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">@@ -215,12 +215,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$editor_user_id, 'read_post', $revision->ID ) );
</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"> // Author should be able to view the revisions fine
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertTrue( user_can( self::$author_user_id, 'read_post', $revision->ID ) );
</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="trunktestsphpunittestsqueryresultsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/query/results.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/query/results.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/query/results.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +415,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expect post ids in the same order as post__in array when order=asc is passed in
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected_returned_array, $q->posts );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 39055
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpagescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-pages-controller.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,9 +7,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage REST API
</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">- /**
- * @group restapi
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group restapi
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Pages_Controller extends WP_Test_REST_Post_Type_Controller_Testcase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $editor_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostmetafieldsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-meta-fields.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage REST API
</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">- /**
- * @group restapi
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group restapi
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Post_Meta_Fields extends WP_Test_REST_TestCase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $wp_meta_keys_saved;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $post_id;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpoststatusescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-statuses-controller.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage REST API
</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">- /**
- * @group restapi
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group restapi
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Post_Statuses_Controller extends WP_Test_REST_Controller_Testcase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_routes() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestposttypescontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-post-types-controller.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage REST API
</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">- /**
- * @group restapi
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group restapi
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Post_Types_Controller extends WP_Test_REST_Controller_Testcase {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_register_routes() {
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestrevisionscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-revisions-controller.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,9 +6,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage REST API
</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">- /**
- * @group restapi
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @group restapi
+ */
</ins><span class="cx" style="display: block; padding: 0 10px"> class WP_Test_REST_Revisions_Controller extends WP_Test_REST_Controller_Testcase {
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $page_id;
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-server.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/rest-api/rest-server.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,12 +397,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_json_error_with_status() {
</span><span class="cx" style="display: block; padding: 0 10px"> $stub = $this->getMockBuilder( 'Spy_REST_Server' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->setMethods( array( 'set_status' ) )
- ->getMock();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->setMethods( array( 'set_status' ) )
+ ->getMock();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $stub->expects( $this->once() )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ->method( 'set_status' )
- ->with( $this->equalTo( 400 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ->method( 'set_status' )
+ ->with( $this->equalTo( 400 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'code' => 'wp-api-test-error',
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTerm.php 2017-11-26 03:16:55 UTC (rev 42227)
+++ trunk/tests/phpunit/tests/term/getTerm.php 2017-11-26 23:56:25 UTC (rev 42228)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 34332
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_should_return_null_when_provided_taxonomy_does_not_match_actual_term_taxonomy() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_should_return_null_when_provided_taxonomy_does_not_match_actual_term_taxonomy() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_id = self::factory()->term->create( array( 'taxonomy' => 'post_tag' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNull( get_term( $term_id, 'category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>