<!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>[32800] trunk/src: `if` is a statment, not a function.</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/32800">32800</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/32800","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-06-16 20:00:15 +0000 (Tue, 16 Jun 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'>`if` is a statment, not a function.
See <a href="https://core.trac.wordpress.org/ticket/32444">#32444</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplinkslisttablephp">trunk/src/wp-admin/includes/class-wp-links-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesdefaultconstantsphp">trunk/src/wp-includes/default-constants.php</a></li>
<li><a href="#trunksrcwpincludesfeedatomcommentsphp">trunk/src/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.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="#trunksrcwpincludesmsfilesphp">trunk/src/wp-includes/ms-files.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -472,7 +472,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = '';
</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( $primary === $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $primary === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplinkslisttablephp"></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-links-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-links-list-table.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/class-wp-links-list-table.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Row action output for links.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function handle_row_actions( $link, $column_name, $primary ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( $primary === $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $primary === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $edit_link = get_edit_bookmark_link( $link );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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-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-list-table.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,7 +634,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_pagenum() {
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum = isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 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">- if( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->_pagination_args['total_pages'] ) && $pagenum > $this->_pagination_args['total_pages'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> $pagenum = $this->_pagination_args['total_pages'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return max( 1, $pagenum );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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-media-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-media-list-table.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Row action output for links.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function handle_row_actions( $link, $column_name, $primary ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( $primary === $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $primary === $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->row_actions( $this->_get_row_actions( $post, $att_title ) );
</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="trunksrcwpadminincludesclasswppressthisphp"></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-press-this.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-press-this.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,7 +1045,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data['t'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $data['t'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif( ! empty( $data['_meta'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $data['_meta'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data['_meta']['twitter:title'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $data['_meta']['twitter:title'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! empty( $data['_meta']['og:title'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/deprecated.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/deprecated.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,9 +572,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function do_paging() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( ! empty($this->search_term) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty($this->search_term) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['usersearch'] = urlencode($this->search_term);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( ! empty($this->role) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty($this->role) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['role'] = urlencode($this->role);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->paging_text = paginate_links( array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/nav-menu.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </dl>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-settings" id="menu-item-settings-<?php echo $item_id; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if( 'custom' == $item->type ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'custom' == $item->type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="field-url description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-url-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'URL' ); ?><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-actions description-wide submitbox">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if( 'custom' != $item->type && $original_title !== false ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="link-to-original">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If first time editing, disable advanced items by default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option($user->ID, 'managenav-menuscolumnshidden',
</span><span class="cx" style="display: block; padding: 0 10px"> array( 0 => 'link-target', 1 => 'css-classes', 2 => 'xfn', 3 => 'description', 4 => 'title-attribute', ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1180,7 +1180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result .= '<p>' . __( 'Add menu items from the column on the left.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $result .= '</div>';
</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( empty($menu_items) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty($menu_items) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result . ' <ul class="menu" id="menu-to-edit"> </ul>';
</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="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/includes/post.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1318,7 +1318,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"> if ( isset( $view_post ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( 'draft' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'draft' == $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_link = set_url_scheme( get_permalink( $post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/meta-boxes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-admin/network.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,7 +58,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function allow_subdomain_install() {
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = preg_replace( '|https?://([^/]+)|', '$1', get_option( 'home' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( parse_url( get_option( 'home' ), PHP_URL_PATH ) || 'localhost' == $domain || preg_match( '|^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$|', $domain ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunksrcwpincludesadminbarphp"></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/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/admin-bar.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +504,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->public )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->show_in_admin_bar ) )
</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( 'draft' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'draft' == $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_link = set_url_scheme( get_permalink( $post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/meta-boxes.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image = new Imagick( $this->file );
</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( ! $this->image->valid() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->image->valid() )
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Select the first frame to handle animated images properly
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $info = pathinfo( $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = $info['dirname'];
</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( $info['extension'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $info['extension'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $ext = $info['extension'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
</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-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3962,12 +3962,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPostType' );
</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( ! post_type_exists( $post_type_name ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! post_type_exists( $post_type_name ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'Invalid post type' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type_object( $post_type_name );
</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( $post_type->cap->edit_posts ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( $post_type->cap->edit_posts ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_post_type( $post_type, $fields );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4019,7 +4019,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $struct = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach( $post_types as $post_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( ! current_user_can( $post_type->cap->edit_posts ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! current_user_can( $post_type->cap->edit_posts ) )
</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"> $struct[$post_type->name] = $this->_prepare_post_type( $post_type, $fields );
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultconstantsphp"></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/default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-constants.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/default-constants.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // set memory limits
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !defined('WP_MEMORY_LIMIT') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( is_multisite() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> define('WP_MEMORY_LIMIT', '64M');
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> define('WP_MEMORY_LIMIT', '40M');
</span></span></pre></div>
<a id="trunksrcwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom-comments.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/feed-atom-comments.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <id><?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?></id>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } elseif(is_search()) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } elseif (is_search()) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <link rel="self" type="application/atom+xml" href="<?php echo get_search_comments_feed_link('', 'atom'); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <id><?php echo get_search_comments_feed_link('', 'atom'); ?></id>
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/feed.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $postids = implode( "','", $post_ids );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_post_time = max( $post_times );
</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( $wp_query->is_comment_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_query->is_comment_feed() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_comment_time = $wpdb->get_var( $wpdb->prepare( "SELECT MAX(comment_date_gmt) FROM $wpdb->comments WHERE comment_post_ID IN ('%s') AND comment_approved = '1'", $postids ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return max( $max_post_time, $max_comment_time );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,7 +676,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $feed->init();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $feed->set_output_encoding( get_option( 'blog_charset' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $feed->set_output_encoding( get_option( 'blog_charset' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed->handle_content_type();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $feed->error() )
</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-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/formatting.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1582,7 +1582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = strtolower(substr($regex[1],1));
</span><span class="cx" style="display: block; padding: 0 10px"> // if too many closing tags
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( $stacksize <= 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $stacksize <= 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = '';
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1637,7 +1637,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attributes
</span><span class="cx" style="display: block; padding: 0 10px"> $attributes = $regex[2];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( ! empty( $attributes ) && $attributes[0] != '>' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $attributes ) && $attributes[0] != '>' )
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes = ' ' . $attributes;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = '<' . $tag . $attributes . '>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2742,7 +2742,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text The text prior to entity conversion.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered = apply_filters( 'pre_ent2ncr', null, $text );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( null !== $filtered )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== $filtered )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $filtered;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $to_ncr = array(
</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-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/functions.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1484,7 +1484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wrapper = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip the protocol.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( wp_is_stream( $target ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_is_stream( $target ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $wrapper, $target ) = explode( '://', $target, 2 );
</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">@@ -1492,7 +1492,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $target = str_replace( '//', '/', $target );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put the wrapper back on the target.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( $wrapper !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wrapper !== null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $target = $wrapper . '://' . $target;
</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="trunksrcwpincludesmsfilesphp"></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/ms-files.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-files.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/ms-files.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SHORTINIT', true );
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
</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_multisite() )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( !is_multisite() )
</ins><span class="cx" style="display: block; padding: 0 10px"> die( 'Multisite support not enabled' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ms_file_constants();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,10 +30,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mime = wp_check_filetype( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $mime[ 'type' ] = mime_content_type( $file );
</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( $mime[ 'type' ] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $mime[ 'type' ] )
</ins><span class="cx" style="display: block; padding: 0 10px"> $mimetype = $mime[ 'type' ];
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> $mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
</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"> // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
</span><span class="cx" style="display: block; padding: 0 10px"> $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
</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( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></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/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/ms-functions.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1863,7 +1863,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> clean_term_cache($term_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( $recurse_start )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $recurse_start )
</ins><span class="cx" style="display: block; padding: 0 10px"> $global_terms_recurse = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $global_id;
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/pluggable.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,7 +409,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( count( $matches ) == 3 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient = $matches[2];
</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"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( count( $matches ) == 3 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient = $matches[2];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -449,7 +449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> // Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( count( $matches ) == 3 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient_name = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $recipient = $matches[2];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1273,9 +1273,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filter the redirect fallback URL for when the provided redirect is not safe (local).
</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"> * @since 4.3.0
</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"> * @param string $fallback_url The fallback URL to use by default.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $status The redirect status.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/post.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @property string $page_template
</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"> * @property-read array $ancestors
</span><span class="cx" style="display: block; padding: 0 10px"> * @property-read int $post_category
</span><span class="cx" style="display: block; padding: 0 10px"> * @property-read string $tag_input
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3294,7 +3294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = 'future';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif( 'future' == $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'future' == $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $now = gmdate('Y-m-d H:i:59');
</span><span class="cx" style="display: block; padding: 0 10px"> if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = 'publish';
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2015-06-16 19:52:39 UTC (rev 32799)
+++ trunk/src/wp-includes/revision.php 2015-06-16 20:00:15 UTC (rev 32800)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //don't save revision if post unchanged
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if( ! $post_has_changed ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $post_has_changed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>