<!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>[31090] trunk/src: The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.</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/31090">31090</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/31090","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-01-08 07:04:40 +0000 (Thu, 08 Jan 2015)</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'>The keyword `elseif` should be used instead of `else if` so that all control keywords look like single words.
This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.
See <a href="https://core.trac.wordpress.org/ticket/30799">#30799</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderskinsphp">trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.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="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpcommentspostphp">trunk/src/wp-comments-post.php</a></li>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.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="#trunksrcwpincludesdatephp">trunk/src/wp-includes/date.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.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="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminphp"></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/admin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/admin.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,12 +167,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"> $hook_suffix = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset($page_hook) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $page_hook ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook_suffix = $page_hook;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else if ( isset($plugin_page) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $plugin_page ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook_suffix = $plugin_page;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-else if ( isset($pagenow) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $pagenow ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hook_suffix = $pagenow;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> set_current_screen();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include(ABSPATH . 'wp-admin/admin-footer.php');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} else if (isset($_GET['import'])) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $_GET['import'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $importer = $_GET['import'];
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/edit-tags.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' != $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = "edit-tags.php?taxonomy=$taxonomy&post_type=$post_type";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} else if ( 'link_category' == $tax->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'link_category' == $tax->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'link-manager.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'edit-tags.php?taxonomy=link_category';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/export.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['content'] ) || 'all' == $_GET['content'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'posts' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'posts' == $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'post';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['cat'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['post_status'] )
</span><span class="cx" style="display: block; padding: 0 10px"> $args['status'] = $_GET['post_status'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'pages' == $_GET['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'pages' == $_GET['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'page';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_GET['page_author'] )
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,10 +422,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $cat_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $cat_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( is_array( $cat_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $cat_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_id = $cat_id['term_id'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $checked_categories[] = $cat_id;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parent ) // Do these all at once in a second
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -741,10 +742,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = wp_insert_term( $cat_name, 'link_category' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $cat_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $cat_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( is_array( $cat_id ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $cat_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_id = $cat_id['term_id'];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_name = esc_html( $cat_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $x->add( array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'link-category',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,7 +1176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( !$mid = add_meta( $pid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $mid = add_meta( $pid ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field 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="trunksrcwpadminincludesclasswpcommentslisttablephp"></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-comments-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-comments-list-table.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,10 +447,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Not looking at all comments.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment_status && 'all' != $comment_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'approved' == $the_comment_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'approved' == $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( 'unapproved' == $the_comment_status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'unapproved' == $the_comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['approve'] = "<a href='$approve_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=approved' class='vim-a vim-destructive' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></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-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-importer.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,14 +273,14 @@
</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"> $last_arg = $key;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( (bool) preg_match( "/^-([a-zA-Z0-9]+)/", $args[$i], $match ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $j = 0, $jl = strlen( $match[1] ); $j < $jl; $j++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = $match[1]{$j};
</span><span class="cx" style="display: block; padding: 0 10px"> $out[$key] = true;
</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"> $last_arg = $key;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $last_arg !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $last_arg !== null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out[$last_arg] = $args[$i];
</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="trunksrcwpadminincludesclasswpupgraderskinsphp"></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-upgrader-skins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/class-wp-upgrader-skins.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,12 +447,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $install_actions['activate_plugin'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'import' == $from )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'import' == $from ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['importers_page'] = '<a href="' . admin_url('import.php') . '" title="' . esc_attr__('Return to Importers') . '" target="_parent">' . __('Return to Importers') . '</a>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( $this->type == 'web' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->type == 'web' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['plugins_page'] = '<a href="' . self_admin_url('plugin-install.php') . '" title="' . esc_attr__('Return to Plugin Installer') . '" target="_parent">' . __('Return to Plugin Installer') . '</a>';
</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"> $install_actions['plugins_page'] = '<a href="' . self_admin_url('plugins.php') . '" title="' . esc_attr__('Return to Plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->result || is_wp_error($this->result) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $install_actions['activate_plugin'], $install_actions['network_activate'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -731,13 +732,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array|WP_Error $data
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function feedback( $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $data ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $data ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string = $data->get_error_message();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( is_array( $data ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $data ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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"> $string = $data;
</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"> if ( ! empty( $this->upgrader->strings[ $string ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $string = $this->upgrader->strings[ $string ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></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-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error($removed) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $removed;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! $removed ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $removed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $args['abort_if_destination_exists'] && $wp_filesystem->exists($remote_destination) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -637,7 +637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $maintenance_string = '<?php $upgrading = ' . time() . '; ?>';
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete($file);
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->put_contents($file, $maintenance_string, FS_CHMOD_FILE);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( !$enable && $wp_filesystem->exists($file) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $enable && $wp_filesystem->exists( $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback('maintenance_end');
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete($file);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/export.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat = get_term( $term['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = array( $cat->term_id => $cat );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $term, $cat );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'all' == $args['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'all' == $args['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $categories = (array) get_categories( array( 'get' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = (array) get_tags( array( 'get' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/file.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -929,7 +929,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // this means it's safe to modify & create new files via PHP.
</span><span class="cx" style="display: block; padding: 0 10px"> $method = 'direct';
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $allow_relaxed_file_ownership ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $allow_relaxed_file_ownership ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
</span><span class="cx" style="display: block; padding: 0 10px"> // safely in this directory. This mode doesn't create new files, only alter existing ones.
</span><span class="cx" style="display: block; padding: 0 10px"> $method = 'direct';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1038,15 +1038,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset($credentials['port']);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( defined('FTP_SSH') && FTP_SSH ) || ( defined('FS_METHOD') && 'ssh2' == FS_METHOD ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ssh';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftps';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( !empty($_POST['connection_type']) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $_POST['connection_type'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( !isset($credentials['connection_type']) ) //All else fails (And it's not defaulted to something else saved), Default to FTP
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftp';
</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"> if ( ! $error &&
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><span class="cx" style="display: block; padding: 0 10px"> ( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) ||
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/media.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,17 +293,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio track title, 2: album title, 3: artist name */
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $meta['album'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $meta['album'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio track title, 2: album title */
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $meta['artist'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $meta['artist'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio track title, 2: artist name */
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= sprintf( __( '"%s".' ), $title );
</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">- } else if ( ! empty( $meta['album'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $meta['album'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta['artist'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: audio album title, 2: artist name */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= $meta['album'] . '.';
</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">- } else if ( ! empty( $meta['artist'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $meta['artist'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content .= $meta['artist'] . '.';
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,11 +166,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $post->ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Scheduled for: <b>%1$s</b>');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Published on: <b>%1$s</b>');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Publish <b>immediately</b>');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Schedule for: <b>%1$s</b>');
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // draft, 1 or more saves, date specified
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __('Publish on: <b>%1$s</b>');
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsphp"></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/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/ms.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,10 +145,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $file == '.' || $file == '..' )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( @is_dir( $dir . DIRECTORY_SEPARATOR . $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack[] = $dir . DIRECTORY_SEPARATOR . $file;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( @is_file( $dir . DIRECTORY_SEPARATOR . $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> @unlink( $dir . DIRECTORY_SEPARATOR . $file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> @closedir( $dh );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/plugin-install.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,7 +517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $api->tested ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->tested ) ), $api->tested, '>' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been tested</strong> with your current version of WordPress.') . '</p></div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $api->requires ) && version_compare( substr( $GLOBALS['wp_version'], 0, strlen( $api->requires ) ), $api->requires, '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="notice notice-warning"><p>' . __('<strong>Warning:</strong> This plugin has <strong>not been marked as compatible</strong> with your version of WordPress.') . '</p></div>';
</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="trunksrcwpadminincludespluginphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/plugin.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1652,7 +1652,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $admin_page_hooks[$parent] ))
</span><span class="cx" style="display: block; padding: 0 10px"> $page_type = $admin_page_hooks[$parent];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( isset( $admin_page_hooks[$parent] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $admin_page_hooks[$parent] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_type = $admin_page_hooks[$parent];
</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">@@ -1713,7 +1713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $submenu_array[2] == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $submenu_array[2] == $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( $submenu_array[1] ))
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span></span></pre></div>
<a id="trunksrcwpadminincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/taxonomy.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/taxonomy.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,12 +66,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_categories( $categories, $post_id = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_ids = array ();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ($categories as $category) {
- if ($id = category_exists($category))
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $categories as $category ) {
+ if ( $id = category_exists( $category ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_ids[] = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
- if ($id = wp_create_category($category))
- $cat_ids[] = $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $id = wp_create_category( $category ) ) {
+ $cat_ids[] = $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"> if ( $post_id )
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/template.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1848,7 +1848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $other_attributes as $attribute => $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( !empty( $other_attributes ) ) { // Attributes provided as a string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $other_attributes ) ) { // Attributes provided as a string
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = $other_attributes;
</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="trunksrcwpadminincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/theme.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can('update_themes') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.' ) . '</strong></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( empty( $update['package'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $update['package'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf( '<p><strong>' . __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ) . '</strong></p>',
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_name, esc_url( $details_url ), esc_attr( $theme['Name'] ), $update['new_version'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/update.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,13 +278,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_network_admin() || !is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
</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 ( ! current_user_can('update_plugins') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( 'update_plugins' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( empty($r->package) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty($r->package) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
</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"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url( self_admin_url('update.php?action=upgrade-plugin&plugin=') . $file, 'upgrade-plugin_' . $file) );
</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"> * Fires at the end of the update message container in each
</span><span class="cx" style="display: block; padding: 0 10px"> * row of the plugins list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,13 +367,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! current_user_can('update_themes') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can('update_themes') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( empty( $r['package'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $r['package'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
</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"> printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
</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"> * Fires at the end of the update message container in each
</span><span class="cx" style="display: block; padding: 0 10px"> * row of the themes list table.
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/includes/upgrade.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_create_user($user_name, $user_password, $user_email);
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option($user_id, 'default_password_nag', true, true);
</span><span class="cx" style="display: block; padding: 0 10px"> $email_password = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( !$user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Password has been provided
</span><span class="cx" style="display: block; padding: 0 10px"> $message = '<em>'.__('Your chosen password.').'</em>';
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = wp_create_user($user_name, $user_password, $user_email);
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -840,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'static' == $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $status = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'page';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'attachment' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'attachment' == $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'inherit';
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1716,14 +1716,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create a tablename index for an array ($cqueries) of queries
</span><span class="cx" style="display: block; padding: 0 10px"> foreach($queries as $qry) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (preg_match("|CREATE TABLE ([^ ]*)|", $qry, $matches)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cqueries[ trim( $matches[1], '`' ) ] = $qry;
</span><span class="cx" style="display: block; padding: 0 10px"> $for_update[$matches[1]] = 'Created table '.$matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if (preg_match("|CREATE DATABASE ([^ ]*)|", $qry, $matches)) {
- array_unshift($cqueries, $qry);
- } else if (preg_match("|INSERT INTO ([^ ]*)|", $qry, $matches)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( "|CREATE DATABASE ([^ ]*)|", $qry, $matches ) ) {
+ array_unshift( $cqueries, $qry );
+ } elseif ( preg_match( "|INSERT INTO ([^ ]*)|", $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iqueries[] = $qry;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if (preg_match("|UPDATE ([^ ]*)|", $qry, $matches)) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( "|UPDATE ([^ ]*)|", $qry, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $iqueries[] = $qry;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Unrecognized query type
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1875,7 +1875,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ($index_name == 'PRIMARY') {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'PRIMARY ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if($index_data['unique']) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $index_data['unique'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'UNIQUE ';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'KEY ';
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/install.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'Your passwords do not match. Please try again.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( empty( $admin_email ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $admin_email ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // TODO: poka-yoke
</span><span class="cx" style="display: block; padding: 0 10px"> display_setup_form( __( 'You must provide an email address.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $error = true;
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></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/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/menu-header.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'current';
</span><span class="cx" style="display: block; padding: 0 10px"> // If plugin_page is set the parent must either match the current page or not physically exist.
</span><span class="cx" style="display: block; padding: 0 10px"> // This allows plugin pages with the same hook to exist under different parents.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif (
</ins><span class="cx" style="display: block; padding: 0 10px"> ( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-admin/options-permalink.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,12 +151,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated"><p><?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $iis7_permalinks ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $permalink_structure && ! $usingpi && ! $writable )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $permalink_structure && ! $usingpi && ! $writable ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e('You should update your web.config now.');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( $permalink_structure && ! $usingpi && $writable )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $permalink_structure && ! $usingpi && $writable ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _e('Permalink structure updated. Remove write access on web.config file now!');
</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"> _e('Permalink structure updated.');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_nginx ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _e('Permalink structure updated.');
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpcommentspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-comments-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-comments-post.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-comments-post.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option('require_name_email') && !$user->exists() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! is_email( $comment_author_email ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_email( $comment_author_email ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
</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="trunksrcwpincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/bookmark.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,17 +386,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr($value);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' == $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "pre_$field", $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( $field, $value, $bookmark_id, $context );
</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 ( 'attribute' == $context )
- $value = esc_attr($value);
- else if ( 'js' == $context )
- $value = esc_js($value);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attribute' == $context ) {
+ $value = esc_attr( $value );
+ } elseif ( 'js' == $context ) {
+ $value = esc_js( $value );
+ }
</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"> return $value;
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></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-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/class-http.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -893,12 +893,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</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 ( isset($r['headers']['User-Agent']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $r['headers']['User-Agent'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['user-agent'] = $r['headers']['User-Agent'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($r['headers']['User-Agent']);
- } else if ( isset($r['headers']['user-agent']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $r['headers']['User-Agent'] );
+ } elseif ( isset( $r['headers']['user-agent'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['user-agent'] = $r['headers']['user-agent'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($r['headers']['user-agent']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $r['headers']['user-agent'] );
</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"> // Construct Cookie: header if any cookies are set.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1358,12 +1358,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_parse_args( $args, $defaults );
</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 ( isset($r['headers']['User-Agent']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $r['headers']['User-Agent'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['user-agent'] = $r['headers']['User-Agent'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($r['headers']['User-Agent']);
- } else if ( isset($r['headers']['user-agent']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $r['headers']['User-Agent'] );
+ } elseif ( isset( $r['headers']['user-agent'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r['user-agent'] = $r['headers']['user-agent'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($r['headers']['user-agent']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $r['headers']['user-agent'] );
</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"> // Construct Cookie: header if any cookies are set.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2244,7 +2244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $headers ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_string( $headers ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_string( $headers ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( stripos($headers, 'content-encoding:') !== false );
</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="trunksrcwpincludesclasswpxmlrpcserverphp"></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-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3211,10 +3211,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $logged_in = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $allow_anon && get_option('comment_registration') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $allow_anon && get_option('comment_registration') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'You must be registered to comment' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( !$allow_anon )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $allow_anon ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->error;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $logged_in = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4873,10 +4874,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ('publish' == $post_status) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'page' == $post_type ) && !current_user_can('publish_pages') )
- return new IXR_Error(401, __('Sorry, you do not have the right to publish this page.'));
- else if ( !current_user_can('publish_posts') )
- return new IXR_Error(401, __('Sorry, you do not have the right to publish this post.'));
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'page' == $post_type ) && ! current_user_can( 'publish_pages' ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this page.' ) );
+ } elseif ( ! current_user_can( 'publish_posts' ) ) {
+ return new IXR_Error( 401, __( 'Sorry, you do not have the right to publish this post.' ) );
+ }
</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 ( $post_more )
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/class-wp.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,11 +135,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_query_vars = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array($extra_query_vars) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $extra_query_vars ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->extra_query_vars = & $extra_query_vars;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if (! empty($extra_query_vars))
- parse_str($extra_query_vars, $this->extra_query_vars);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $extra_query_vars ) ) {
+ parse_str( $extra_query_vars, $this->extra_query_vars );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch the rewrite rules.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exit_required = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( empty($this->query_vars['feed']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $this->query_vars['feed'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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></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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/comment-template.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1168,7 +1168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_args['include_unapproved'] = array( $user_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $comment_author_email ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $comment_author_email ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_args['include_unapproved'] = array( $comment_author_email );
</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="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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/comment.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -506,7 +506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable ORDER BY with 'none', an empty array, or boolean false.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $this->query_vars['orderby'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $this->query_vars['orderby'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ordersby = is_array( $this->query_vars['orderby'] ) ?
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_vars['orderby'] :
</span><span class="cx" style="display: block; padding: 0 10px"> preg_split( '/[,\s]/', $this->query_vars['orderby'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2228,9 +2228,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $data['comment_approved'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'hold' == $data['comment_approved'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'hold' == $data['comment_approved'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'approve' == $data['comment_approved'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'approve' == $data['comment_approved'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 1;
</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="trunksrcwpincludesdatephp"></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/date.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/date.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/date.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,7 +425,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $valid = false;
</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">- } else if ( $day_exists && $month_exists ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $day_exists && $month_exists ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * 2. checking day, month combination
</span><span class="cx" style="display: block; padding: 0 10px"> * We use 2012 because, as a leap year, it's the most permissive.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -607,7 +607,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $query as $key => $clause ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relation' === $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $relation = $query['relation'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_array( $clause ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $clause ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a first-order clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_first_order_clause( $clause ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -616,7 +616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where_count = count( $clause_sql['where'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $where_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 1 === $where_count ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === $where_count ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = $clause_sql['where'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,16 +725,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $query['year'] ) && $value = $this->build_value( $compare, $query['year'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = "YEAR( $column ) $compare $value";
</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 ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $query['month'] ) && $value = $this->build_value( $compare, $query['month'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = "MONTH( $column ) $compare $value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $query['monthnum'] ) && $value = $this->build_value( $compare, $query['monthnum'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = "MONTH( $column ) $compare $value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ if ( isset( $query['week'] ) && false !== ( $value = $this->build_value( $compare, $query['week'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $query['w'] ) && false !== ( $value = $this->build_value( $compare, $query['w'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = _wp_mysql_week( $column ) . " $compare $value";
</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"> if ( isset( $query['dayofyear'] ) && $value = $this->build_value( $compare, $query['dayofyear'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $where_parts[] = "DAYOFYEAR( $column ) $compare $value";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,14 +858,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => intval( $matches[1] ),
</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">- } else if ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Y-m
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => intval( $matches[1] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'month' => intval( $matches[2] ),
</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">- } else if ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Y-m-d
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => intval( $matches[1] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'day' => intval( $matches[3] ),
</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">- } else if ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Y-m-d H:i
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'year' => intval( $matches[1] ),
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/deprecated.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2396,7 +2396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !$cur )
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert($wpdb->usermeta, compact('user_id', 'meta_key', 'meta_value') );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( $cur->meta_value != $meta_value )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( $cur->meta_value != $meta_value )
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update($wpdb->usermeta, compact('meta_value'), compact('user_id', 'meta_key') );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/formatting.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1502,7 +1502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // or close to be safe $tag = '/' . $tag;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // if stacktop value = tag close value then pop
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = '</' . $tag . '>'; // Close Tag
</span><span class="cx" style="display: block; padding: 0 10px"> // Pop
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $tagstack );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2337,7 +2337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return gmdate('Y-m-d H:i:s', $timestamp);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ($timezone == 'user') {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ($timezone == 'user') {
</ins><span class="cx" style="display: block; padding: 0 10px"> return preg_replace('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', '$1-$2-$3 $4:$5:$6', $date_string);
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/functions.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,7 +1437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['_wp_http_referer'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_unslash( $_REQUEST['_wp_http_referer'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( ! empty( $_SERVER['HTTP_REFERER'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( ! empty( $_SERVER['HTTP_REFERER'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_unslash( $_SERVER['HTTP_REFERER'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1670,11 +1670,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function win_is_writable( $path ) {
</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 ( $path[strlen( $path ) - 1] == '/' ) // if it looks like a directory, check a random file within the directory
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $path[strlen( $path ) - 1] == '/' ) { // if it looks like a directory, check a random file within the directory
</ins><span class="cx" style="display: block; padding: 0 10px"> return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( is_dir( $path ) ) // If it's a directory (and not a file) check a random file within the directory
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory
</ins><span class="cx" style="display: block; padding: 0 10px"> return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
</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"> // check tmp file for read/write capabilities
</span><span class="cx" style="display: block; padding: 0 10px"> $should_delete_tmp_file = !file_exists( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> $f = @fopen( $path, 'a' );
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/l10n.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -594,7 +594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $plugin_rel_path ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( false !== $deprecated ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false !== $deprecated ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '2.7' );
</span><span class="cx" style="display: block; padding: 0 10px"> $path = ABSPATH . trim( $deprecated, '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/load.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // IIS Isapi_Rewrite
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Use ORIG_PATH_INFO if there is no PATH_INFO
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -427,7 +427,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"> $first_init = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Sometimes advanced-cache.php can load object-cache.php before
</span><span class="cx" style="display: block; padding: 0 10px"> * it is loaded here. This breaks the function_exists check above
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/media.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1984,11 +1984,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Empty array on failure. List of taxonomies on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_attachment_taxonomies($attachment) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_int( $attachment ) )
- $attachment = get_post($attachment);
- else if ( is_array($attachment) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_int( $attachment ) ) {
+ $attachment = get_post( $attachment );
+ } elseif ( is_array( $attachment ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachment = (object) $attachment;
</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"> if ( ! is_object($attachment) )
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/meta.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,11 +995,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relation' === $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $relation = $query;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! is_array( $query ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_array( $query ) ) {
</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"> // First-order clause.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $this->is_first_order_clause( $query ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->is_first_order_clause( $query ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $query['value'] ) && array() === $query['value'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $query['value'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,7 +1029,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This value will not actually be used to join clauses, but it
</span><span class="cx" style="display: block; padding: 0 10px"> * simplifies the logic around combining key-only queries.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 1 === count( $clean_queries ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === count( $clean_queries ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $clean_queries['relation'] = 'OR';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Default to AND.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1093,11 +1093,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_meta_query,
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_meta_query,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $primary_meta_query ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $primary_meta_query ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_query = array(
</span><span class="cx" style="display: block; padding: 0 10px"> $primary_meta_query,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! empty( $existing_meta_query ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $existing_meta_query ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_query = $existing_meta_query;
</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">@@ -1254,7 +1254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $query as $key => &$clause ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relation' === $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $relation = $query['relation'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_array( $clause ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $clause ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a first-order clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_first_order_clause( $clause ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1263,7 +1263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where_count = count( $clause_sql['where'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $where_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 1 === $where_count ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 === $where_count ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = $clause_sql['where'][0];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,7 +1492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compatible_compares = array( '=', 'IN', 'BETWEEN', 'LIKE', 'REGEXP', 'RLIKE', '>', '>=', '<', '<=' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clauses joined by AND with "negative" operators share a join only if they also share a key.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
</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="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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/nav-menu.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -806,7 +806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' == $menu_item_type
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids[] = (int) $menu_item->ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif (
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' == $object_type &&
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' == $menu_item_type &&
</span><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
</span></span></pre></div>
<a id="trunksrcwpincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/plugin.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $wp_filter[ $tag ]) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filter[ $tag ] = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( isset( $wp_filter[ $tag ][ $priority ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $wp_filter[ $tag ][ $priority ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_filter[ $tag ][ $priority ] = array();
</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">@@ -900,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $obj_idx;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_string($function[0]) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_string( $function[0] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Static Calling
</span><span class="cx" style="display: block; padding: 0 10px"> return $function[0] . '::' . $function[1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/post-template.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $protected_title_format, $title );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( isset( $post->post_status ) && 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
</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"> * Filter the text prepended to the post title of private posts.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $post_type ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = reset( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_author() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_author() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author = $wp_query->get_queried_object();
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'author';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $author->user_nicename ) ) {
</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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/post.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2184,7 +2184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr($value);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' == $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</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">@@ -2252,7 +2252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attribute' == $context )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr($value);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( 'js' == $context )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( 'js' == $context )
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_js($value);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3907,7 +3907,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_categories = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 1 == count($post_categories) && '' == reset($post_categories) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/query.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1654,9 +1654,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_date = true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strlen($qv['m']) > 9 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_time = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( strlen($qv['m']) > 7 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( strlen( $qv['m'] ) > 7 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_day = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( strlen($qv['m']) > 5 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( strlen( $qv['m'] ) > 5 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_month = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_year = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1956,7 +1956,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
</span><span class="cx" style="display: block; padding: 0 10px"> $q['tag_slug__in'][] = $tag;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tags as $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2467,7 +2467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = (int) $q['posts_per_page'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['posts_per_page'] < -1 )
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = abs($q['posts_per_page']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( $q['posts_per_page'] == 0 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( $q['posts_per_page'] == 0 )
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4350,7 +4350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $page_obj->post_title, $page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( in_array( $page_obj->post_name, $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $page_obj->post_name, $page ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $page as $pagepath ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4568,7 +4568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $more = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $this->is_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->is_feed() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $more = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $more = 0;
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></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/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/rewrite.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1376,11 +1376,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rewrite = array_merge($rewrite, array($pagematch => $pagequery));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //only on pages with comments add ../comment-page-xx/
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( EP_PAGES & $ep_mask || EP_PERMALINK & $ep_mask ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rewrite = array_merge($rewrite, array($commentmatch => $commentquery));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( EP_ROOT & $ep_mask && get_option('page_on_front') )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( EP_ROOT & $ep_mask && get_option('page_on_front') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rewrite = array_merge($rewrite, array($rootcommentmatch => $rootcommentquery));
</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"> //do endpoints
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $endpoints ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $ep_query_append as $regex => $ep) {
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/template.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
</span><span class="cx" style="display: block; padding: 0 10px"> $located = STYLESHEETPATH . '/' . $template_name;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $located = TEMPLATEPATH . '/' . $template_name;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/user.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,7 +630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'ID';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'meta_value' == $qv['orderby'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "$wpdb->usermeta.meta_value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'include' === $qv['orderby'] && ! empty( $include ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'include' === $qv['orderby'] && ! empty( $include ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Sanitized earlier.
</span><span class="cx" style="display: block; padding: 0 10px"> $include_sql = implode( ',', $include );
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( $wpdb->users.ID, $include_sql )";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1514,7 +1514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_html( $value ); // textarea_escaped?
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr($value);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' == $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "pre_{$field}", $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1559,11 +1559,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'user_url' == $field )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_url($value);
</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 ( 'attribute' == $context )
- $value = esc_attr($value);
- else if ( 'js' == $context )
- $value = esc_js($value);
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attribute' == $context ) {
+ $value = esc_attr( $value );
+ } elseif ( 'js' == $context ) {
+ $value = esc_js( $value );
+ }
</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="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 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-includes/wp-db.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1366,7 +1366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ( mysqli_more_results( $this->dbh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> mysqli_next_result( $this->dbh );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_resource( $this->result ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_resource( $this->result ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> mysql_free_result( $this->result );
</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">@@ -1435,9 +1435,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->has_connected ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attempt_fallback = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attempt_fallback = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( ! function_exists( 'mysql_connect' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! function_exists( 'mysql_connect' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attempt_fallback = false;
</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">@@ -1475,7 +1475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> " ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( $this->dbh ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $this->dbh ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->has_connected = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_charset( $this->dbh );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->ready = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1673,7 +1673,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->last_result[$num_rows] = $row;
</span><span class="cx" style="display: block; padding: 0 10px"> $num_rows++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( is_resource( $this->result ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_resource( $this->result ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( $row = @mysql_fetch_object( $this->result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->last_result[$num_rows] = $row;
</span><span class="cx" style="display: block; padding: 0 10px"> $num_rows++;
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2015-01-08 06:46:55 UTC (rev 31089)
+++ trunk/src/wp-login.php 2015-01-08 07:04:40 UTC (rev 31090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_POST['user_login'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('empty_username', __('<strong>ERROR</strong>: Enter a username or e-mail address.'));
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else if ( strpos( $_POST['user_login'], '@' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( strpos( $_POST['user_login'], '@' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_data = get_user_by( 'email', trim( $_POST['user_login'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $user_data ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,10 +333,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allow = apply_filters( 'allow_password_reset', true, $user_data->ID );
</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 ( ! $allow )
- return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
- else if ( is_wp_error($allow) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $allow ) {
+ return new WP_Error( 'no_password_reset', __('Password reset is not allowed for this user') );
+ } elseif ( is_wp_error( $allow ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $allow;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Generate something random for a password reset key.
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_generate_password( 20, false );
</span></span></pre>
</div>
</div>
</body>
</html>