<!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>[33734] trunk/src: `foreach` is a statement, 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/33734">33734</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/33734","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-08-25 20:27:56 +0000 (Tue, 25 Aug 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'>`foreach` is a statement, not a function.
See <a href="https://core.trac.wordpress.org/ticket/33491">#33491</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppressthisphp">trunk/src/wp-admin/includes/class-wp-press-this.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.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="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.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="#trunksrcwpadminloadscriptsphp">trunk/src/wp-admin/load-scripts.php</a></li>
<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpincludesclassoembedphp">trunk/src/wp-includes/class-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizecontrolphp">trunk/src/wp-includes/class-wp-customize-control.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.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="#trunksrcwpincludesclasswpdependenciesphp">trunk/src/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.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="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>
<li><a href="#trunksrcwpincludespostformatsphp">trunk/src/wp-includes/post-formats.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="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesrssphp">trunk/src/wp-includes/rss.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwpsettingsphp">trunk/src/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/edit.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trash':
</span><span class="cx" style="display: block; padding: 0 10px"> $trashed = $locked = 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">- foreach( (array) $post_ids as $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $post_ids as $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __('You are not allowed to move this item to the Trash.') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'untrash':
</span><span class="cx" style="display: block; padding: 0 10px"> $untrashed = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $post_ids as $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $post_ids as $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id) )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __('You are not allowed to restore this item from the Trash.') );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $post_ids as $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $post_ids as $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_del = get_post($post_id);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !current_user_can( 'delete_post', $post_id ) )
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -868,7 +868,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need a primary defined so responsive views show something,
</span><span class="cx" style="display: block; padding: 0 10px"> // so let's fall back to the first non-checkbox column.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $columns as $col => $column_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $columns as $col => $column_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'cb' === $col ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/class-wp-press-this.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,7 +984,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 ( ! empty( $data['_embeds'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $data['_embeds'] as $src ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $data['_embeds'] as $src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prot_relative_src = preg_replace( '/^https?:/', '', $src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $prot_relative_src, $this->embeds ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1012,7 +1012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $selected_images = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data['_images'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $data['_images'] as $src ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $data['_images'] as $src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $src, 'gravatar.com' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/dashboard.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1069,7 +1069,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $feeds Array of RSS feeds.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_primary_output( $widget_id, $feeds ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $feeds as $type => $args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $feeds as $type => $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['type'] = $type;
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="rss-widget">';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $type === 'plugins' ) {
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/media.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1239,7 +1239,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"> // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
</ins><span class="cx" style="display: block; padding: 0 10px"> $form_fields = array_merge_recursive($form_fields, (array) $errors);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This was formerly in image_attachment_fields_to_edit().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1627,7 +1627,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"> // Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
</ins><span class="cx" style="display: block; padding: 0 10px"> $form_fields = array_merge_recursive($form_fields, (array) $args['errors'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/ms.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,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"> $stack = array_reverse( $stack ); // Last added dirs are deepest
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $stack as $dir ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $stack as $dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $dir != $top_dir)
</span><span class="cx" style="display: block; padding: 0 10px"> @rmdir( $dir );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -802,7 +802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = false;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="primary_blog" id="primary_blog">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach( (array) $all_blogs as $blog ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( (array) $all_blogs as $blog ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $primary_blog == $blog->userblog_id )
</span><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span><span class="cx" style="display: block; padding: 0 10px"> ?><option value="<?php echo $blog->userblog_id ?>"<?php selected( $primary_blog, $blog->userblog_id ); ?>><?php echo esc_url( get_home_url( $blog->userblog_id ) ) ?></option><?php
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/nav-menu.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,7 +426,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ));
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) || is_wp_error( $terms ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $terms as $term ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $terms as $term ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'markup' == $response_format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'json' == $response_format ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1081,7 +1081,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through all the menu items' POST values.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> // Checkbox is not checked.
</span><span class="cx" style="display: block; padding: 0 10px"> empty( $_item_object_data['menu-item-object-id'] ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1214,7 +1214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'menu_walker_not_exist', sprintf( __('The Walker class named <strong>%s</strong> does not exist.'), $walker_class_name ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $some_pending_menu_items = $some_invalid_menu_items = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $menu_items as $menu_item ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_items as $menu_item ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status )
</span><span class="cx" style="display: block; padding: 0 10px"> $some_pending_menu_items = true;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $menu_item->_invalid ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1271,7 +1271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete orphaned draft menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items_to_delete = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts AS p LEFT JOIN $wpdb->postmeta AS m ON p.ID = m.post_id WHERE post_type = 'nav_menu_item' AND post_status = 'draft' AND meta_key = '_menu_item_orphaned' AND meta_value < '%d'", $delete_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">- foreach( (array) $menu_items_to_delete as $menu_item_id )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_items_to_delete as $menu_item_id )
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $menu_item_id, true );
</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">@@ -1302,7 +1302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_defer_term_counting( true );
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through all the menu items' POST variables
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['menu-item-db-id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Menu item title can't be blank
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] )
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/plugin-install.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -497,7 +497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $api->ratings as $key => $ratecount ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $api->ratings as $key => $ratecount ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Avoid div-by-zero.
</span><span class="cx" style="display: block; padding: 0 10px"> $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/plugin.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -765,7 +765,7 @@
</span><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"> $checked = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $plugins as $plugin )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $plugins as $plugin )
</ins><span class="cx" style="display: block; padding: 0 10px"> $checked[] = 'checked[]=' . $plugin;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +813,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = 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">- foreach( $plugins as $plugin_file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $plugins as $plugin_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Run Uninstall hook.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_uninstallable_plugin( $plugin_file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> uninstall_plugin($plugin_file);
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/post.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'post_title', 'post_content', 'post_excerpt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $fields as $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $fields as $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data[ $field ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1123,7 +1123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset($q['post_mime_type']);
</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">- foreach( array_keys( $post_mime_types ) as $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array_keys( $post_mime_types ) as $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_mime_type'] = $type;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/template.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = array_keys( $categories );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $keys as $k ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $keys as $k ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $checked_categories[] = $categories[$k];
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $categories[$k] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></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-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/update-core.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,7 +881,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $checksums ) && isset( $checksums[ $wp_version ] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $checksums = $checksums[ $wp_version ]; // Compat code for 3.7-beta2
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $checksums ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $checksums as $file => $checksum ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $checksums as $file => $checksum ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'wp-content' == substr( $file, 0, 10 ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( ABSPATH . $file ) )
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/update.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,7 +288,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = get_site_transient( 'update_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($plugins->response) && is_array($plugins->response) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = array_keys( $plugins->response );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $plugins as $plugin_file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $plugins as $plugin_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 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">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset($themes->response) && is_array($themes->response) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $themes = array_keys( $themes->response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $themes as $theme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $themes as $theme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
</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="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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/includes/upgrade.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the title and ID of every post, post_name to check if it already has a value
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
</span><span class="cx" style="display: block; padding: 0 10px"> if ($posts) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($posts as $post) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($posts as $post) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ('' == $post->post_name) {
</span><span class="cx" style="display: block; padding: 0 10px"> $newtitle = sanitize_title($post->post_title);
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -699,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove extraneous backslashes.
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
</span><span class="cx" style="display: block; padding: 0 10px"> if ($posts) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($posts as $post) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($posts as $post) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_content = addslashes(deslash($post->post_content));
</span><span class="cx" style="display: block; padding: 0 10px"> $post_title = addslashes(deslash($post->post_title));
</span><span class="cx" style="display: block; padding: 0 10px"> $post_excerpt = addslashes(deslash($post->post_excerpt));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove extraneous backslashes.
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
</span><span class="cx" style="display: block; padding: 0 10px"> if ($comments) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($comments as $comment) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($comments as $comment) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_content = deslash($comment->comment_content);
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_author = deslash($comment->comment_author);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,7 +727,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove extraneous backslashes.
</span><span class="cx" style="display: block; padding: 0 10px"> $links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
</span><span class="cx" style="display: block; padding: 0 10px"> if ($links) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($links as $link) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($links as $link) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_name = deslash($link->link_name);
</span><span class="cx" style="display: block; padding: 0 10px"> $link_description = deslash($link->link_description);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1205,7 +1205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $start = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> while( $rows = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options ORDER BY option_id LIMIT $start, 20" ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $rows as $row ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $rows as $row ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $row->option_value;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !@unserialize( $value ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = stripslashes( $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1639,7 +1639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $start = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> while( $rows = $wpdb->get_results( "SELECT meta_key, meta_value FROM {$wpdb->sitemeta} ORDER BY meta_id LIMIT $start, 20" ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $rows as $row ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $rows as $row ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $row->meta_value;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !@unserialize( $value ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $value = stripslashes( $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1721,7 +1721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_should_upgrade_global_tables() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $indexes as $index ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $indexes as $index ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade = true;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2025,7 +2025,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $for_update = array();
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($queries as $qry) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($queries as $qry) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( "|CREATE TABLE ([^ ]*)|", $qry, $matches ) ) {
</span><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2214,7 +2214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "$index_string ($alt_index_columns)",
</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">- foreach( $index_strings as $index_string ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $index_strings as $index_string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( ( $aindex = array_search( $index_string, $indices ) ) === false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $indices[ $aindex ] );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2265,7 +2265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function make_db_current( $tables = 'all' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alterations = dbDelta( $tables );
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<ol>\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($alterations as $alteration) echo "<li>$alteration</li>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($alterations as $alteration) echo "<li>$alteration</li>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</ol>\n";
</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="trunksrcwpadminloadscriptsphp"></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/load-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-scripts.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/load-scripts.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = new WP_Scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_scripts($wp_scripts);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach( $load as $handle ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( $load as $handle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !array_key_exists($handle, $wp_scripts->registered) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminloadstylesphp"></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/load-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/load-styles.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_styles = new WP_Styles();
</span><span class="cx" style="display: block; padding: 0 10px"> wp_default_styles($wp_styles);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach( $load as $handle ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( $load as $handle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !array_key_exists($handle, $wp_styles->registered) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/nav-menus.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -67,7 +67,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the data we need in one pass through the array of menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $orders_to_dbids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->menu_order ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -140,7 +140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set up the data we need in one pass through the array of menu items.
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $orders_to_dbids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $ordered_menu_item_object->menu_order ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dbids_to_orders[$ordered_menu_item_object->ID] = $ordered_menu_item_object->menu_order;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Generate truncated menu names.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-foreach( (array) $nav_menus as $key => $_nav_menu ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+foreach ( (array) $nav_menus as $key => $_nav_menu ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
</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">@@ -588,7 +588,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $messages as $message ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $messages as $message ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $message . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $add_new_screen ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="0" selected="selected"><?php _e( '— Select —' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php foreach( (array) $nav_menus as $_nav_menu ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php foreach ( (array) $nav_menus as $_nav_menu ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $_nav_menu->term_id ); ?>" <?php selected( $_nav_menu->term_id, $nav_menu_selected_id ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $_nav_menu->truncated_name ) ;
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/network/site-themes.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $themes = (array) $_POST['checked'];
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'enabled';
</span><span class="cx" style="display: block; padding: 0 10px"> $n = count( $themes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $themes as $theme )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $themes as $theme )
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ $theme ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'error';
</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"> $themes = (array) $_POST['checked'];
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'disabled';
</span><span class="cx" style="display: block; padding: 0 10px"> $n = count( $themes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $themes as $theme )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $themes as $theme )
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $allowed_themes[ $theme ] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'error';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/network/themes.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $themes as $theme )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $themes as $theme )
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ $theme ] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'enabled', count( $themes ), $referer ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'error', 'none', $referer ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $themes as $theme )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $themes as $theme )
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $allowed_themes[ $theme ] );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'allowedthemes', $allowed_themes );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'disabled', count( $themes ), $referer ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/network/users.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $_POST['user'] ) && ! empty( $_POST['user'] ) )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $_POST['user'] as $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $_POST['user'] as $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_user', $id ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_user( $id );
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/plugins.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get plugins list from that folder.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $folder_plugins as $plugin_file => $data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $folder_plugins as $plugin_file => $data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin_info[ $plugin_file ]['Network'] ) {
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/setup-config.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( "Sorry, but I can’t write the <code>wp-config.php</code> file." ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $config_file as $line ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $config_file as $line ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo htmlentities($line, ENT_COMPAT, 'UTF-8');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?></textarea>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path_to_wp_config = dirname( ABSPATH ) . '/wp-config.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $handle = fopen( $path_to_wp_config, 'w' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $config_file as $line ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $config_file as $line ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( $handle, $line );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $handle );
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></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/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-admin/update-core.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></p>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul id="dismissed-updates" class="core-updates dismissed">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $dismissed as $update) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $dismissed as $update) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<li>';
</span><span class="cx" style="display: block; padding: 0 10px"> list_core_update( $update );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</li>';
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<ul class="core-updates">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $updates as $update ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $updates as $update ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<li>';
</span><span class="cx" style="display: block; padding: 0 10px"> list_core_update( $update );
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</li>';
</span></span></pre></div>
<a id="trunksrcwpincludesclassoembedphp"></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-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-oembed.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-oembed.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -405,7 +405,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( array( 'json', 'xml' ) as $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array( 'json', 'xml' ) as $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = $this->_fetch_with_format( $provider, $format );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizecontrolphp"></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-customize-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-control.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp-customize-control.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function input_attrs() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->input_attrs as $attr => $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->input_attrs as $attr => $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $attr . '="' . esc_attr( $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="trunksrcwpincludesclasswpembedphp"></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-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp-embed.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,7 +272,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty($post_metas) )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $post_metas as $post_meta_key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $post_metas as $post_meta_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) )
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_ID, $post_meta_key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2015-08-25 20:27:56 UTC (rev 33734)
</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"> $mime_types = wp_get_mime_types();
</span><span class="cx" style="display: block; padding: 0 10px"> $extensions = array_keys( $mime_types );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $extensions as $_extension ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $extensions as $_extension ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( "/{$extension}/i", $_extension ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $mime_types[$_extension];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-walker.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp-walker.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // descend only when the depth is right and there are childrens for this element
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$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">- foreach( $children_elements[ $id ] as $child ){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $children_elements[ $id ] as $child ){
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($newlevel) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $newlevel = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $empty_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_elements as $orphans )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $orphans as $op )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $orphans as $op )
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->display_element( $op, $empty_array, 1, 0, $args, $output );
</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">@@ -374,7 +374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $end >= $total_top && count( $children_elements ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $empty_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_elements as $orphans )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $orphans as $op )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $orphans as $op )
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->display_element( $op, $empty_array, 1, 0, $args, $output );
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2948,7 +2948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $all_tags = get_tags() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $all_tags as $tag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $all_tags as $tag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $struct = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $struct['tag_id'] = $tag->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $struct['name'] = $tag->name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4048,7 +4048,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $struct = 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">- foreach( $post_types as $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $post_types as $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $post_type->cap->edit_posts ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5367,7 +5367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $catids = wp_get_post_categories($post_ID);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($catids as $catid)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($catids as $catid)
</ins><span class="cx" style="display: block; padding: 0 10px"> $categories[] = get_cat_name($catid);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tagnames = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5506,7 +5506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $catids = wp_get_post_categories($entry['ID']);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $catids as $catid )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $catids as $catid )
</ins><span class="cx" style="display: block; padding: 0 10px"> $categories[] = get_cat_name($catid);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tagnames = array();
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class-wp.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $headers as $name => $field_value )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $headers as $name => $field_value )
</ins><span class="cx" style="display: block; padding: 0 10px"> @header("{$name}: {$field_value}");
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $exit_required )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdependenciesphp"></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-dependencies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-dependencies.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/class.wp-dependencies.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $handles = false === $handles ? $this->queue : (array) $handles;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->all_deps( $handles );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->to_do as $key => $handle ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->to_do as $key => $handle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !in_array($handle, $this->done, true) && isset($this->registered[$handle]) ) {
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/comment.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2402,7 +2402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_ID ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $fields as $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $fields as $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $commentdata[ $field ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/formatting.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sentences = explode( $open_quote, $haystack );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $sentences as $key => &$sentence ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $sentences as $key => &$sentence ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $sentence, $needle ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4442,7 +4442,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $matches = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match_all( $regex, $content, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $matches[1] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $matches[1] as $emoji ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $matches[1] as $emoji ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * UTF-32's hex encoding is the same as HTML's hex encoding.
</span><span class="cx" style="display: block; padding: 0 10px"> * So, by converting the emoji from UTF-8 to UTF-32, we magically
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/functions.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $timezone_string ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_object = timezone_open( $timezone_string );
</span><span class="cx" style="display: block; padding: 0 10px"> $date_object = date_create( null, $timezone_object );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $timezone_formats as $timezone_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $timezone_formats as $timezone_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $formatted = date_format( $date_object, $timezone_format );
</span><span class="cx" style="display: block; padding: 0 10px"> $dateformatstring = ' '.$dateformatstring;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,7 +1080,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $headers as $name => $field_value )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $headers as $name => $field_value )
</ins><span class="cx" style="display: block; padding: 0 10px"> @header("{$name}: {$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="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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/l10n.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $lang_files = glob( ( is_null( $dir) ? WP_LANG_DIR : $dir ) . '/*.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lang_files ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $lang_files as $lang_file ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $lang_files as $lang_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lang_file = basename( $lang_file, '.mo' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 !== strpos( $lang_file, 'continents-cities' ) && 0 !== strpos( $lang_file, 'ms-' ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> 0 !== strpos( $lang_file, 'admin-' ) ) {
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/nav-menu.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,7 +644,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $GLOBALS['_menu_item_sort_prop'] = $args['output_key'];
</span><span class="cx" style="display: block; padding: 0 10px"> usort($items, '_sort_nav_menu_items');
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $items as $k => $item ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $items as $k => $item ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $items[$k]->{$args['output_key']} = $i++;
</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">@@ -848,7 +848,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => -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">- foreach( (array) $menu_items as $menu_item ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_items as $menu_item ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,7 +883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'post_type' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $menu_item_ids as $menu_item_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_item_ids as $menu_item_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $menu_item_id, true );
</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">@@ -902,7 +902,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids = wp_get_associated_nav_menu_items( $object_id, 'taxonomy', $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $menu_item_ids as $menu_item_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $menu_item_ids as $menu_item_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_delete_post( $menu_item_id, 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="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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/pluggable.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set custom headers
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $headers ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $headers as $name => $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $headers as $name => $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
</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="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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/plugin.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,7 +207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = func_get_args();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) current($wp_filter[$tag]) as $the_ )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) current($wp_filter[$tag]) as $the_ )
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_null($the_['function']) ){
</span><span class="cx" style="display: block; padding: 0 10px"> $args[1] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> $value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -264,7 +264,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $wp_filter[ $tag ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) current($wp_filter[$tag]) as $the_ )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) current($wp_filter[$tag]) as $the_ )
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_null($the_['function']) )
</span><span class="cx" style="display: block; padding: 0 10px"> $args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $wp_filter[ $tag ] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) current($wp_filter[$tag]) as $the_ )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) current($wp_filter[$tag]) as $the_ )
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_null($the_['function']) )
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -845,7 +845,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $wp_filter['all'] );
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) current($wp_filter['all']) as $the_ )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) current($wp_filter['all']) as $the_ )
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !is_null($the_['function']) )
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func_array($the_['function'], $args);
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespostformatsphp"></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-formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-formats.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/post-formats.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _post_format_get_terms( $terms, $taxonomies, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'post_format', (array) $taxonomies ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $terms as $order => $name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $terms as $order => $name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms[$order] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/post.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2464,7 +2464,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $counts = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $count as $row ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $count as $row ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $counts[ $row['post_mime_type'] ] = $row['num_posts'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3079,7 +3079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Backward compatibility. Prior to 3.1 expected posts to be returned in array.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ARRAY_A == $output ){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $results as $key => $result ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $results as $key => $result ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $results[$key] = get_object_vars( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $results ? $results : array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3398,7 +3398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $emoji_fields as $emoji_field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $emoji_fields as $emoji_field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data[ $emoji_field ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'utf8' === $charset ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4149,7 +4149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $custom_fields as $key => $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'enclosure' != $key || !is_array( $val ) )
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $val as $enc ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $val as $enc ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $enclosure = explode( "\n", $enc );
</span><span class="cx" style="display: block; padding: 0 10px"> $pung[] = trim( $enclosure[ 0 ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4239,7 +4239,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"> $trackback_urls = explode( ',', $tb_list );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $trackback_urls as $tb_url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $trackback_urls as $tb_url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tb_url = trim( $tb_url );
</span><span class="cx" style="display: block; padding: 0 10px"> trackback( $tb_url, wp_unslash( $postdata['post_title'] ), $excerpt, $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4485,7 +4485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _page_traverse_name( $page_id, &$children, &$result ){
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $children[ $page_id ] ) ){
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array)$children[ $page_id ] as $child ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array)$children[ $page_id ] as $child ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result[ $child->ID ] = $child->post_name;
</span><span class="cx" style="display: block; padding: 0 10px"> _page_traverse_name( $child->ID, $children, $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4774,7 +4774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r['exclude_tree'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude = wp_parse_id_list( $r['exclude_tree'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $exclude as $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $exclude as $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $children = get_page_children( $id, $pages );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children as $child ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $exclude[] = $child->ID;
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/query.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2176,7 +2176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Comma-separated list of search stopwords in your language' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $stopwords = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $words as $word ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $words as $word ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $word = trim( $word, "\r\n\t " );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $word )
</span><span class="cx" style="display: block; padding: 0 10px"> $stopwords[] = $word;
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/revision.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,7 +336,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array_keys( _wp_post_revision_fields() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( array_intersect( array_keys( $revision ), $fields ) as $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( array_intersect( array_keys( $revision ), $fields ) as $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $update[$field] = $revision[$field];
</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="trunksrcwpincludesrssphp"></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/rss.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rss.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/rss.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // find Etag, and Last-Modified
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $resp->headers as $h) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $resp->headers as $h) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
</span><span class="cx" style="display: block; padding: 0 10px"> if (strpos($h, ": ")) {
</span><span class="cx" style="display: block; padding: 0 10px"> list($field, $val) = explode(": ", $h, 2);
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/shortcodes.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $atts = (array)$atts;
</span><span class="cx" style="display: block; padding: 0 10px"> $out = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach($pairs as $name => $default) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ($pairs as $name => $default) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists($name, $atts) )
</span><span class="cx" style="display: block; padding: 0 10px"> $out[$name] = $atts[$name];
</span><span class="cx" style="display: block; padding: 0 10px"> else
</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-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-includes/wp-db.php 2015-08-25 20:27:56 UTC (rev 33734)
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $modes as $i => $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $modes as $i => $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $mode, $incompatible_modes ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $modes[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2249,7 +2249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Return an integer-keyed array of...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->last_result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $this->last_result as $row ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $this->last_result as $row ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $output == ARRAY_N ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // ...integer-keyed row arrays
</span><span class="cx" style="display: block; padding: 0 10px"> $new_array[] = array_values( get_object_vars( $row ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2594,7 +2594,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 any of the columns don't have one of these collations, it needs more sanity checking.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( $this->col_meta[ $table ] as $col ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( $this->col_meta[ $table ] as $col ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $col->Collation ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2944,7 +2944,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $col_offset == -1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_array = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( (array) $this->col_info as $col ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( (array) $this->col_info as $col ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_array[$i] = $col->{$info_type};
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-settings.php 2015-08-25 20:11:27 UTC (rev 33733)
+++ trunk/src/wp-settings.php 2015-08-25 20:27:56 UTC (rev 33734)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load network activated plugins.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach( wp_get_active_network_plugins() as $network_plugin ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ foreach ( wp_get_active_network_plugins() as $network_plugin ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_register_plugin_realpath( $network_plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> include_once( $network_plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>