<!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>[29206] trunk/src/wp-admin: Fix syntax for single- and multi-line comments in wp-admin-directory files.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/29206">29206</a></dd>
<dt>Author</dt> <dd>DrewAPicture</dd>
<dt>Date</dt> <dd>2014-07-17 09:13:53 +0000 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix syntax for single- and multi-line comments in wp-admin-directory files.
See <a href="http://core.trac.wordpress.org/ticket/28931">#28931</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminphp">trunk/src/wp-admin/admin.php</a></li>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadmincustomizephp">trunk/src/wp-admin/customize.php</a></li>
<li><a href="#trunksrcwpadminincludesadminphp">trunk/src/wp-admin/includes/admin.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemdirectphp">trunk/src/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesmsdeprecatedphp">trunk/src/wp-admin/includes/ms-deprecated.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="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.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="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadmininstallhelperphp">trunk/src/wp-admin/install-helper.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminlinkparseopmlphp">trunk/src/wp-admin/link-parse-opml.php</a></li>
<li><a href="#trunksrcwpadminlinkphp">trunk/src/wp-admin/link.php</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpressthisphp">trunk/src/wp-admin/press-this.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/admin.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/admin.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/admin.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -151,7 +151,8 @@
</span><span class="cx"> $the_parent = $pagenow;
</span><span class="cx"> if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
</span><span class="cx"> $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
</span><del>- // backwards compatibility for plugins using add_management_page
</del><ins>+
+ // Backwards compatibility for plugins using add_management_page().
</ins><span class="cx"> if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
</span><span class="cx"> // There could be plugin specific params on the URL, so we need the whole query string
</span><span class="cx"> if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
</span></span></pre></div>
<a id="trunksrcwpadminasyncuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/async-upload.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/async-upload.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/async-upload.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -94,10 +94,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $_REQUEST['short'] ) {
</span><del>- // short form response - attachment ID only
</del><ins>+ // Short form response - attachment ID only.
</ins><span class="cx"> echo $id;
</span><span class="cx"> } else {
</span><del>- // long form response - big chunk o html
</del><ins>+ // Long form response - big chunk o html.
</ins><span class="cx"> $type = $_REQUEST['type'];
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-background.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-background.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/custom-background.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -256,7 +256,8 @@
</span><span class="cx">
</span><span class="cx"> if ( get_background_image() ) {
</span><span class="cx"> $background_image_thumb = esc_url( set_url_scheme( get_theme_mod( 'background_image_thumb', str_replace( '%', '%%', get_background_image() ) ) ) );
</span><del>- // background-image URL must be single quote, see below
</del><ins>+
+ // Background-image URL must be single quote, see below.
</ins><span class="cx"> $background_styles .= ' background-image: url(\'' . $background_image_thumb . '\');'
</span><span class="cx"> . ' background-repeat: ' . get_theme_mod( 'background_repeat', get_theme_support( 'custom-background', 'default-repeat' ) ) . ';'
</span><span class="cx"> . ' background-position: top ' . get_theme_mod( 'background_position_x', get_theme_support( 'custom-background', 'default-position-x' ) );
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-header.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-header.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/custom-header.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> $url = $object['guid'];
</span><span class="cx"> $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
</span><span class="cx">
</span><del>- // cleanup
</del><ins>+ // Cleanup.
</ins><span class="cx"> $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
</span><span class="cx"> if ( file_exists( $medium ) ) {
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadmincustomizephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/customize.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/customize.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/customize.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -189,12 +189,14 @@
</span><span class="cx"> */
</span><span class="cx"> do_action( 'customize_controls_print_footer_scripts' );
</span><span class="cx">
</span><del>- // If the frontend and the admin are served from the same domain, load the
- // preview over ssl if the customizer is being loaded over ssl. This avoids
- // insecure content warnings. This is not attempted if the admin and frontend
- // are on different domains to avoid the case where the frontend doesn't have
- // ssl certs. Domain mapping plugins can allow other urls in these conditions
- // using the customize_allowed_urls filter.
</del><ins>+ /*
+ * If the frontend and the admin are served from the same domain, load the
+ * preview over ssl if the customizer is being loaded over ssl. This avoids
+ * insecure content warnings. This is not attempted if the admin and frontend
+ * are on different domains to avoid the case where the frontend doesn't have
+ * ssl certs. Domain mapping plugins can allow other urls in these conditions
+ * using the customize_allowed_urls filter.
+ */
</ins><span class="cx">
</span><span class="cx"> $allowed_urls = array( home_url('/') );
</span><span class="cx"> $admin_origin = parse_url( admin_url() );
</span></span></pre></div>
<a id="trunksrcwpadminincludesadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/admin.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/admin.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/admin.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -7,9 +7,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> if ( ! defined('WP_ADMIN') ) {
</span><del>- // This file is being included from a file other than wp-admin/admin.php, so
- // some setup was skipped. Make sure the admin message catalog is loaded since
- // load_default_textdomain() will not have done so in this context.
</del><ins>+ /*
+ * This file is being included from a file other than wp-admin/admin.php, so
+ * some setup was skipped. Make sure the admin message catalog is loaded since
+ * load_default_textdomain() will not have done so in this context.
+ */
</ins><span class="cx"> load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ajax-actions.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ajax-actions.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> function wp_ajax_nopriv_heartbeat() {
</span><span class="cx"> $response = array();
</span><span class="cx">
</span><del>- // screen_id is the same as $current_screen->id and the JS global 'pagenow'
</del><ins>+ // screen_id is the same as $current_screen->id and the JS global 'pagenow'.
</ins><span class="cx"> if ( ! empty($_POST['screen_id']) )
</span><span class="cx"> $screen_id = sanitize_key($_POST['screen_id']);
</span><span class="cx"> else
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> */
</span><span class="cx"> do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
</span><span class="cx">
</span><del>- // send the current time according to the server
</del><ins>+ // Send the current time according to the server.
</ins><span class="cx"> $response['server_time'] = time();
</span><span class="cx">
</span><span class="cx"> wp_send_json($response);
</span><span class="lines">@@ -362,16 +362,19 @@
</span><span class="cx">
</span><span class="cx"> $comment_count = wp_count_comments($post_id);
</span><span class="cx">
</span><del>- if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count
</del><ins>+ // We're looking for a known type of comment count.
+ if ( isset( $comment_count->$status ) )
</ins><span class="cx"> $total = $comment_count->$status;
</span><del>- // else use the decremented value from above
</del><ins>+ // Else use the decremented value from above.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- $time = time(); // The time since the last comment count
</del><ins>+ // The time since the last comment count.
+ $time = time();
</ins><span class="cx">
</span><span class="cx"> $x = new WP_Ajax_Response( array(
</span><span class="cx"> 'what' => 'comment',
</span><del>- 'id' => $comment_id, // here for completeness - not used
</del><ins>+ // Here for completeness - not used.
+ 'id' => $comment_id,
</ins><span class="cx"> 'supplemental' => array(
</span><span class="cx"> 'total_items_i18n' => sprintf( _n( '1 item', '%s items', $total ), number_format_i18n( $total ) ),
</span><span class="cx"> 'total_pages' => ceil( $total / $per_page ),
</span><span class="lines">@@ -955,7 +958,7 @@
</span><span class="cx"> $comment_auto_approved = false;
</span><span class="cx"> $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
</span><span class="cx">
</span><del>- // automatically approve parent comment
</del><ins>+ // Automatically approve parent comment.
</ins><span class="cx"> if ( !empty($_POST['approve_parent']) ) {
</span><span class="cx"> $parent = get_comment( $comment_parent );
</span><span class="cx">
</span><span class="lines">@@ -1512,18 +1515,20 @@
</span><span class="cx"> $data = &$_POST;
</span><span class="cx">
</span><span class="cx"> $post = get_post( $post_ID, ARRAY_A );
</span><del>- $post = wp_slash($post); //since it is from db
</del><span class="cx">
</span><ins>+ // Since it's coming from the database.
+ $post = wp_slash($post);
+
</ins><span class="cx"> $data['content'] = $post['post_content'];
</span><span class="cx"> $data['excerpt'] = $post['post_excerpt'];
</span><span class="cx">
</span><del>- // rename
</del><ins>+ // Rename.
</ins><span class="cx"> $data['user_ID'] = get_current_user_id();
</span><span class="cx">
</span><span class="cx"> if ( isset($data['post_parent']) )
</span><span class="cx"> $data['parent_id'] = $data['post_parent'];
</span><span class="cx">
</span><del>- // status
</del><ins>+ // Status.
</ins><span class="cx"> if ( isset($data['keep_private']) && 'private' == $data['keep_private'] )
</span><span class="cx"> $data['post_status'] = 'private';
</span><span class="cx"> else
</span><span class="lines">@@ -1540,7 +1545,7 @@
</span><span class="cx"> $data['post_name'] = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // update the post
</del><ins>+ // Update the post.
</ins><span class="cx"> edit_post();
</span><span class="cx">
</span><span class="cx"> $wp_list_table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => $_POST['screen'] ) );
</span><span class="lines">@@ -1686,7 +1691,7 @@
</span><span class="cx">
</span><span class="cx"> unset( $_POST['savewidgets'], $_POST['action'] );
</span><span class="cx">
</span><del>- // save widgets order for all sidebars
</del><ins>+ // Save widgets order for all sidebars.
</ins><span class="cx"> if ( is_array($_POST['sidebars']) ) {
</span><span class="cx"> $sidebars = array();
</span><span class="cx"> foreach ( $_POST['sidebars'] as $key => $val ) {
</span><span class="lines">@@ -1751,7 +1756,7 @@
</span><span class="cx"> $sidebars = wp_get_sidebars_widgets();
</span><span class="cx"> $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
</span><span class="cx">
</span><del>- // delete
</del><ins>+ // Delete.
</ins><span class="cx"> if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
</span><span class="cx">
</span><span class="cx"> if ( !isset($wp_registered_widgets[$widget_id]) )
</span><span class="lines">@@ -2411,9 +2416,11 @@
</span><span class="cx"> $title = wp_basename( $src );
</span><span class="cx">
</span><span class="cx"> $post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
</span><del>- // ping WordPress for an embed
</del><ins>+
+ // Ping WordPress for an embed.
</ins><span class="cx"> $check_embed = $wp_embed->run_shortcode( '[embed]'. $src .'[/embed]' );
</span><del>- // fallback that WordPress creates when no oEmbed was found
</del><ins>+
+ // Fallback that WordPress creates when no oEmbed was found.
</ins><span class="cx"> $fallback = $wp_embed->maybe_make_link( $src );
</span><span class="cx">
</span><span class="cx"> if ( $check_embed !== $fallback ) {
</span><span class="lines">@@ -2456,7 +2463,7 @@
</span><span class="cx"> wp_send_json($response);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // screen_id is the same as $current_screen->id and the JS global 'pagenow'
</del><ins>+ // screen_id is the same as $current_screen->id and the JS global 'pagenow'.
</ins><span class="cx"> if ( ! empty($_POST['screen_id']) )
</span><span class="cx"> $screen_id = sanitize_key($_POST['screen_id']);
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $user_can ) {
</span><del>- // preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash
</del><ins>+ // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
</ins><span class="cx"> $actions = array(
</span><span class="cx"> 'approve' => '', 'unapprove' => '',
</span><span class="cx"> 'reply' => '',
</span><span class="lines">@@ -434,7 +434,8 @@
</span><span class="cx"> 'trash' => '', 'untrash' => '', 'delete' => ''
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( $comment_status && 'all' != $comment_status ) { // not looking at all comments
</del><ins>+ // Not looking at all comments.
+ if ( $comment_status && 'all' != $comment_status ) {
</ins><span class="cx"> if ( 'approved' == $the_comment_status )
</span><span class="cx"> $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&new=unapproved' class='vim-u vim-destructive' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
</span><span class="cx"> else if ( 'unapproved' == $the_comment_status )
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-base.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -308,16 +308,21 @@
</span><span class="cx"> if ( $index == $last_index )
</span><span class="cx"> continue; // We want this to be caught by the next code block.
</span><span class="cx">
</span><del>- // Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
- // If it's found, change into it and follow through looking for it.
- // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
- // If it reaches the end, and still cant find it, it'll return false for the entire function.
</del><ins>+ /*
+ * Working from /home/ to /user/ to /wordpress/ see if that file exists within
+ * the current folder, If it's found, change into it and follow through looking
+ * for it. If it cant find WordPress down that route, it'll continue onto the next
+ * folder level, and see if that matches, and so on. If it reaches the end, and still
+ * cant find it, it'll return false for the entire function.
+ */
</ins><span class="cx"> if ( isset($files[ $key ]) ){
</span><ins>+
</ins><span class="cx"> // Lets try that folder:
</span><span class="cx"> $newdir = trailingslashit(path_join($base, $key));
</span><span class="cx"> if ( $this->verbose )
</span><span class="cx"> printf( "\n" . __('Changing to %s') . "<br/>\n", $newdir );
</span><del>- // only search for the remaining path tokens in the directory, not the full path again
</del><ins>+
+ // Only search for the remaining path tokens in the directory, not the full path again.
</ins><span class="cx"> $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
</span><span class="cx"> if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop) )
</span><span class="cx"> return $ret;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-direct.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> if ( ! $overwrite && $this->exists($destination) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // try using rename first. if that fails (for example, source is read only) try copy
</del><ins>+ // Try using rename first. if that fails (for example, source is read only) try copy.
</ins><span class="cx"> if ( @rename($source, $destination) )
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
</span><del>- // safe mode fails with a trailing slash under certain PHP versions.
</del><ins>+ // Safe mode fails with a trailing slash under certain PHP versions.
</ins><span class="cx"> $path = untrailingslashit($path);
</span><span class="cx"> if ( empty($path) )
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> public function exists( $file ) {
</span><span class="cx"> $list = $this->ftp->nlist( $file );
</span><span class="cx"> return !empty( $list ); //empty list = no file, so invert.
</span><del>- // return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server
</del><ins>+ // Return $this->ftp->is_exists($file); has issues with ABOR+426 responses on the ncFTPd server.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function is_file($file) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -85,7 +85,8 @@
</span><span class="cx"> $this->options['username'] = $opt['username'];
</span><span class="cx">
</span><span class="cx"> if ( empty ($opt['password']) ) {
</span><del>- if ( !$this->keys ) //password can be blank if we are using keys
</del><ins>+ // Password can be blank if we are using keys.
+ if ( !$this->keys )
</ins><span class="cx"> $this->errors->add('empty_password', __('SSH2 password is required'));
</span><span class="cx"> } else {
</span><span class="cx"> $this->options['password'] = $opt['password'];
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-importer.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-importer.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> }
</span><span class="cx"> } while ( count( $results ) == $limit );
</span><span class="cx">
</span><del>- // unset to save memory
</del><ins>+ // Unset to save memory.
</ins><span class="cx"> unset( $results, $r );
</span><span class="cx">
</span><span class="cx"> return $hashtable;
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> if ( !empty( $result ) )
</span><span class="cx"> $count = intval( $result[0]->cnt );
</span><span class="cx">
</span><del>- // unset to save memory
</del><ins>+ // Unset to save memory.
</ins><span class="cx"> unset( $results );
</span><span class="cx">
</span><span class="cx"> return $count;
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> }
</span><span class="cx"> } while ( count( $results ) == $limit );
</span><span class="cx">
</span><del>- // unset to save memory
</del><ins>+ // Unset to save memory.
</ins><span class="cx"> unset( $results, $r );
</span><span class="cx">
</span><span class="cx"> return $hashtable;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> if ( !$args['total_pages'] && $args['per_page'] > 0 )
</span><span class="cx"> $args['total_pages'] = ceil( $args['total_items'] / $args['per_page'] );
</span><span class="cx">
</span><del>- // redirect if page number is invalid and headers are not already sent
</del><ins>+ // Redirect if page number is invalid and headers are not already sent.
</ins><span class="cx"> if ( ! headers_sent() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) && $args['total_pages'] > 0 && $this->get_pagenum() > $args['total_pages'] ) {
</span><span class="cx"> wp_redirect( add_query_arg( 'paged', $args['total_pages'] ) );
</span><span class="cx"> exit;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -38,8 +38,10 @@
</span><span class="cx"> $s = trim($s, '*');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If the network is large and a search is not being performed, show only the latest blogs with no paging in order
- // to avoid expensive count queries.
</del><ins>+ /*
+ * If the network is large and a search is not being performed, show only
+ * the latest blogs with no paging in order to avoid expensive count queries.
+ */
</ins><span class="cx"> if ( !$s && wp_is_large_network() ) {
</span><span class="cx"> if ( !isset($_REQUEST['orderby']) )
</span><span class="cx"> $_GET['orderby'] = $_REQUEST['orderby'] = '';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -33,7 +33,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected function get_table_classes() {
</span><del>- return array( 'widefat', 'plugins' ); // todo: remove and add CSS for .themes
</del><ins>+ // todo: remove and add CSS for .themes
+ return array( 'widefat', 'plugins' );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public function ajax_user_can() {
</span><span class="lines">@@ -268,7 +269,7 @@
</span><span class="cx"> $allowed = $theme->is_allowed( 'network' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // preorder
</del><ins>+ // Pre-order.
</ins><span class="cx"> $actions = array(
</span><span class="cx"> 'enable' => '',
</span><span class="cx"> 'disable' => '',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -40,8 +40,11 @@
</span><span class="cx"> $args['include'] = $wpdb->get_col( "SELECT ID FROM $wpdb->users WHERE user_login IN ('$logins')" );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If the network is large and a search is not being performed, show only the latest users with no paging in order
- // to avoid expensive count queries.
</del><ins>+ /*
+ * If the network is large and a search is not being performed,
+ * show only the latest users with no paging in order to avoid
+ * expensive count queries.
+ */
</ins><span class="cx"> if ( !$usersearch && wp_is_large_network( 'users' ) ) {
</span><span class="cx"> if ( !isset($_REQUEST['orderby']) )
</span><span class="cx"> $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> $context = $status;
</span><span class="cx"> $screen = $this->screen;
</span><span class="cx">
</span><del>- // preorder
</del><ins>+ // Pre-order.
</ins><span class="cx"> $actions = array(
</span><span class="cx"> 'deactivate' => '',
</span><span class="cx"> 'activate' => '',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -414,7 +414,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $pages as $page ) {
</span><span class="cx">
</span><del>- // catch and repair bad pages
</del><ins>+ // Catch and repair bad pages.
</ins><span class="cx"> if ( $page->post_parent == $page->ID ) {
</span><span class="cx"> $page->post_parent = 0;
</span><span class="cx"> $wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
</span><span class="lines">@@ -449,7 +449,7 @@
</span><span class="cx"> $this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // if it is the last pagenum and there are orphaned pages, display them with paging as well
</del><ins>+ // If it is the last pagenum and there are orphaned pages, display them with paging as well.
</ins><span class="cx"> if ( isset( $children_pages ) && $count < $end ){
</span><span class="cx"> foreach ( $children_pages as $orphans ){
</span><span class="cx"> foreach ( $orphans as $op ) {
</span><span class="lines">@@ -591,7 +591,7 @@
</span><span class="cx"> $attributes = 'class="post-title page-title column-title"' . $style;
</span><span class="cx"> if ( $this->hierarchical_display ) {
</span><span class="cx"> if ( 0 == $level && (int) $post->post_parent > 0 ) {
</span><del>- //sent level 0 by accident, by default, or because we don't know the actual level
</del><ins>+ // Sent level 0 by accident, by default, or because we don't know the actual level.
</ins><span class="cx"> $find_main_page = (int) $post->post_parent;
</span><span class="cx"> while ( $find_main_page > 0 ) {
</span><span class="cx"> $parent = get_post( $find_main_page );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -155,12 +155,13 @@
</span><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $page = $args['page'];
</span><del>- // set variable because $args['number'] can be subsequently overridden
</del><ins>+
+ // Set variable because $args['number'] can be subsequently overridden.
</ins><span class="cx"> $number = $args['number'];
</span><span class="cx">
</span><span class="cx"> $args['offset'] = $offset = ( $page - 1 ) * $number;
</span><span class="cx">
</span><del>- // convert it to table rows
</del><ins>+ // Convert it to table rows.
</ins><span class="cx"> $count = 0;
</span><span class="cx">
</span><span class="cx"> if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'featured':
</span><del>- //case 'popular':
</del><ins>+ // case 'popular':
</ins><span class="cx"> case 'new':
</span><span class="cx"> case 'updated':
</span><span class="cx"> $args['browse'] = $tab;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // else, fallthrough. install_themes doesn't help if you can't enable it.
</del><ins>+ // Else, fallthrough. install_themes doesn't help if you can't enable it.
</ins><span class="cx"> } else {
</span><span class="cx"> if ( current_user_can( 'install_themes' ) ) {
</span><span class="cx"> printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -190,7 +190,8 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args($args, $defaults);
</span><del>- // these were previously extract()'d
</del><ins>+
+ // These were previously extract()'d.
</ins><span class="cx"> $source = $args['source'];
</span><span class="cx"> $destination = $args['destination'];
</span><span class="cx"> $clear_destination = $args['clear_destination'];
</span><span class="lines">@@ -249,14 +250,19 @@
</span><span class="cx"> return $source;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- //Has the source location changed? If so, we need a new source_files list.
</del><ins>+ // Has the source location changed? If so, we need a new source_files list.
</ins><span class="cx"> if ( $source !== $remote_source ) {
</span><span class="cx"> $source_files = array_keys( $wp_filesystem->dirlist( $source ) );
</span><span class="cx"> }
</span><del>- // Protection against deleting files in any important base directories.
- // Theme_Upgrader & Plugin_Upgrader also trigger this, as they pass the destination directory (WP_PLUGIN_DIR / wp-content/themes)
- // intending to copy the directory into the directory, whilst they pass the source as the actual files to copy.
</del><ins>+ /*
+ * Protection against deleting files in any important base directories.
+ * Theme_Upgrader & Plugin_Upgrader also trigger this, as they pass the
+ * destination directory (WP_PLUGIN_DIR / wp-content/themes) intending
+ * to copy the directory into the directory, whilst they pass the source
+ * as the actual files to copy.
+ */
</ins><span class="cx"> $protected_directories = array( ABSPATH, WP_CONTENT_DIR, WP_PLUGIN_DIR, WP_CONTENT_DIR . '/themes' );
</span><ins>+
</ins><span class="cx"> if ( is_array( $wp_theme_directories ) ) {
</span><span class="cx"> $protected_directories = array_merge( $protected_directories, $wp_theme_directories );
</span><span class="cx"> }
</span><span class="lines">@@ -716,7 +722,7 @@
</span><span class="cx"> return $source;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- //return plugin info.
</del><ins>+ // Return plugin info.
</ins><span class="cx"> public function plugin_info() {
</span><span class="cx"> if ( ! is_array($this->result) )
</span><span class="cx"> return false;
</span><span class="lines">@@ -1266,8 +1272,10 @@
</span><span class="cx"> $this->update_count = count( $language_updates );
</span><span class="cx"> $this->update_current = 0;
</span><span class="cx">
</span><del>- // The filesystem's mkdir() is not recursive. Make sure WP_LANG_DIR exists,
- // as we then may need to create a /plugins or /themes directory inside of it.
</del><ins>+ /*
+ * The filesystem's mkdir() is not recursive. Make sure WP_LANG_DIR exists,
+ * as we then may need to create a /plugins or /themes directory inside of it.
+ */
</ins><span class="cx"> $remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
</span><span class="cx"> if ( ! $wp_filesystem->exists( $remote_destination ) )
</span><span class="cx"> if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
</span><span class="lines">@@ -1469,9 +1477,11 @@
</span><span class="cx"> $try_rollback = false;
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span><span class="cx"> $error_code = $result->get_error_code();
</span><del>- // Not all errors are equal. These codes are critical: copy_failed__copy_dir,
- // mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
- // do_rollback allows for update_core() to trigger a rollback if needed.
</del><ins>+ /*
+ * Not all errors are equal. These codes are critical: copy_failed__copy_dir,
+ * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
+ * do_rollback allows for update_core() to trigger a rollback if needed.
+ */
</ins><span class="cx"> if ( false !== strpos( $error_code, 'do_rollback' ) )
</span><span class="cx"> $try_rollback = true;
</span><span class="cx"> elseif ( false !== strpos( $error_code, '__copy_dir' ) )
</span><span class="lines">@@ -1601,7 +1611,7 @@
</span><span class="cx"> */
</span><span class="cx"> if ( ! apply_filters( 'allow_dev_auto_core_updates', $upgrade_dev ) )
</span><span class="cx"> return false;
</span><del>- // else fall through to minor + major branches below
</del><ins>+ // Else fall through to minor + major branches below.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 4: Minor In-branch updates (3.7.0 -> 3.7.1 -> 3.7.2 -> 3.7.4)
</span><span class="lines">@@ -1692,10 +1702,10 @@
</span><span class="cx"> 'post_status' => 'private'
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // Save the data
</del><ins>+ // Save the data.
</ins><span class="cx"> $this->id = wp_insert_attachment( $object, $file['file'] );
</span><span class="cx">
</span><del>- // schedule a cleanup for 2 hours from now in case of failed install
</del><ins>+ // Schedule a cleanup for 2 hours from now in case of failed install.
</ins><span class="cx"> wp_schedule_single_event( time() + 2 * HOUR_IN_SECONDS, 'upgrader_scheduled_cleanup', array( $this->id ) );
</span><span class="cx">
</span><span class="cx"> } elseif ( is_numeric( $_GET[$urlholder] ) ) {
</span><span class="lines">@@ -2018,16 +2028,18 @@
</span><span class="cx"> // Boom, This sites about to get a whole new splash of paint!
</span><span class="cx"> $upgrade_result = $upgrader->upgrade( $upgrader_item, array(
</span><span class="cx"> 'clear_update_cache' => false,
</span><del>- 'pre_check_md5' => false, /* always use partial builds if possible for core updates */
- 'attempt_rollback' => true, /* only available for core updates */
</del><ins>+ // Always use partial builds if possible for core updates.
+ 'pre_check_md5' => false,
+ // Only available for core updates.
+ 'attempt_rollback' => true,
</ins><span class="cx"> ) );
</span><span class="cx">
</span><del>- // if the filesystem is unavailable, false is returned.
</del><ins>+ // If the filesystem is unavailable, false is returned.
</ins><span class="cx"> if ( false === $upgrade_result ) {
</span><span class="cx"> $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Core doesn't output this, so lets append it so we don't get confused
</del><ins>+ // Core doesn't output this, so lets append it so we don't get confused.
</ins><span class="cx"> if ( 'core' == $type ) {
</span><span class="cx"> if ( is_wp_error( $upgrade_result ) ) {
</span><span class="cx"> $skin->error( __( 'Installation Failed' ), $upgrade_result );
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/dashboard.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/dashboard.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/dashboard.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx">
</span><span class="cx"> $actions_string = '';
</span><span class="cx"> if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
</span><del>- // preorder it: Approve | Reply | Edit | Spam | Trash
</del><ins>+ // Pre-order it: Approve | Reply | Edit | Spam | Trash.
</ins><span class="cx"> $actions = array(
</span><span class="cx"> 'approve' => '', 'unapprove' => '',
</span><span class="cx"> 'reply' => '',
</span><span class="lines">@@ -898,7 +898,8 @@
</span><span class="cx"> $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
</span><span class="cx"> $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
</span><span class="cx"> $widget_options[$widget_id]['number'] = $number;
</span><del>- // title is optional. If black, fill it if possible
</del><ins>+
+ // Title is optional. If black, fill it if possible.
</ins><span class="cx"> if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
</span><span class="cx"> $rss = fetch_feed($widget_options[$widget_id]['url']);
</span><span class="cx"> if ( is_wp_error($rss) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/export.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/export.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/export.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -83,10 +83,13 @@
</span><span class="cx"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_date < %s", date( 'Y-m-d', strtotime('+1 month', strtotime($args['end_date'])) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // grab a snapshot of post IDs, just in case it changes during the export
</del><ins>+ // Grab a snapshot of post IDs, just in case it changes during the export.
</ins><span class="cx"> $post_ids = $wpdb->get_col( "SELECT ID FROM {$wpdb->posts} $join WHERE $where" );
</span><span class="cx">
</span><del>- // get the requested terms ready, empty unless posts filtered by category or all content
</del><ins>+ /*
+ * Get the requested terms ready, empty unless posts filtered by category
+ * or all content.
+ */
</ins><span class="cx"> $cats = $tags = $terms = array();
</span><span class="cx"> if ( isset( $term ) && $term ) {
</span><span class="cx"> $cat = get_term( $term['term_id'], 'category' );
</span><span class="lines">@@ -99,7 +102,7 @@
</span><span class="cx"> $custom_taxonomies = get_taxonomies( array( '_builtin' => false ) );
</span><span class="cx"> $custom_terms = (array) get_terms( $custom_taxonomies, array( 'get' => 'all' ) );
</span><span class="cx">
</span><del>- // put categories in order with no child going before its parent
</del><ins>+ // Put categories in order with no child going before its parent.
</ins><span class="cx"> while ( $cat = array_shift( $categories ) ) {
</span><span class="cx"> if ( $cat->parent == 0 || isset( $cats[$cat->parent] ) )
</span><span class="cx"> $cats[$cat->term_id] = $cat;
</span><span class="lines">@@ -107,7 +110,7 @@
</span><span class="cx"> $categories[] = $cat;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // put terms in order with no child going before its parent
</del><ins>+ // Put terms in order with no child going before its parent.
</ins><span class="cx"> while ( $t = array_shift( $custom_terms ) ) {
</span><span class="cx"> if ( $t->parent == 0 || isset( $terms[$t->parent] ) )
</span><span class="cx"> $terms[$t->term_id] = $t;
</span><span class="lines">@@ -144,10 +147,10 @@
</span><span class="cx"> * @return string Site URL.
</span><span class="cx"> */
</span><span class="cx"> function wxr_site_url() {
</span><del>- // ms: the base url
</del><ins>+ // Multisite: the base URL.
</ins><span class="cx"> if ( is_multisite() )
</span><span class="cx"> return network_home_url();
</span><del>- // wp: the blog url
</del><ins>+ // WordPress (single site): the blog URL.
</ins><span class="cx"> else
</span><span class="cx"> return get_bloginfo_rss( 'url' );
</span><span class="cx"> }
</span><span class="lines">@@ -373,14 +376,16 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( $post_ids ) {
</span><span class="cx"> global $wp_query;
</span><del>- $wp_query->in_the_loop = true; // Fake being in the loop.
</del><span class="cx">
</span><del>- // fetch 20 posts at a time rather than loading the entire table into memory
</del><ins>+ // Fake being in the loop.
+ $wp_query->in_the_loop = true;
+
+ // Fetch 20 posts at a time rather than loading the entire table into memory.
</ins><span class="cx"> while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
</span><span class="cx"> $where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
</span><span class="cx"> $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
</span><span class="cx">
</span><del>- // Begin Loop
</del><ins>+ // Begin Loop.
</ins><span class="cx"> foreach ( $posts as $post ) {
</span><span class="cx"> setup_postdata( $post );
</span><span class="cx"> $is_sticky = is_sticky( $post->ID ) ? 1 : 0;
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/file.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/file.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/file.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -179,8 +179,8 @@
</span><span class="cx"> case 1 :
</span><span class="cx"> wp_die( __( 'Sorry, that file cannot be edited.' ) );
</span><span class="cx">
</span><del>- //case 2 :
- // wp_die( __('Sorry, can’t call files with their real path.' ));
</del><ins>+ // case 2 :
+ // wp_die( __('Sorry, can’t call files with their real path.' ));
</ins><span class="cx">
</span><span class="cx"> case 3 :
</span><span class="cx"> wp_die( __( 'Sorry, that file cannot be edited.' ) );
</span><span class="lines">@@ -257,7 +257,10 @@
</span><span class="cx"> __( "Failed to write file to disk." ),
</span><span class="cx"> __( "File upload stopped by extension." ));
</span><span class="cx">
</span><del>- // this may not have orignially been intended to be overrideable, but historically has been
</del><ins>+ /*
+ * This may not have orignially been intended to be overrideable,
+ * but historically has been.
+ */
</ins><span class="cx"> if ( isset( $overrides['upload_error_strings'] ) ) {
</span><span class="cx"> $upload_error_strings = $overrides['upload_error_strings'];
</span><span class="cx"> }
</span><span class="lines">@@ -267,7 +270,7 @@
</span><span class="cx"> $test_size = isset( $overrides['test_size'] ) ? $overrides['test_size'] : true;
</span><span class="cx"> $test_upload = isset( $overrides['test_upload'] ) ? $overrides['test_upload'] : true;
</span><span class="cx">
</span><del>- // If you override this, you must provide $ext and $type!!!!
</del><ins>+ // If you override this, you must provide $ext and $type!!
</ins><span class="cx"> $test_type = isset( $overrides['test_type'] ) ? $overrides['test_type'] : true;
</span><span class="cx"> $mimes = isset( $overrides['mimes'] ) ? $overrides['mimes'] : false;
</span><span class="cx">
</span><span class="lines">@@ -314,13 +317,16 @@
</span><span class="cx"> $type = '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // A writable uploads dir will pass this test. Again, there's no point overriding this one.
</del><ins>+ /*
+ * A writable uploads dir will pass this test. Again, there's no point
+ * overriding this one.
+ */
</ins><span class="cx"> if ( ! ( ( $uploads = wp_upload_dir($time) ) && false === $uploads['error'] ) )
</span><span class="cx"> return call_user_func($upload_error_handler, $file, $uploads['error'] );
</span><span class="cx">
</span><span class="cx"> $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
</span><span class="cx">
</span><del>- // Move the file to the uploads dir
</del><ins>+ // Move the file to the uploads dir.
</ins><span class="cx"> $new_file = $uploads['path'] . "/$filename";
</span><span class="cx"> if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) {
</span><span class="cx"> if ( 0 === strpos( $uploads['basedir'], ABSPATH ) )
</span><span class="lines">@@ -331,12 +337,12 @@
</span><span class="cx"> return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Set correct file permissions
</del><ins>+ // Set correct file permissions.
</ins><span class="cx"> $stat = stat( dirname( $new_file ));
</span><span class="cx"> $perms = $stat['mode'] & 0000666;
</span><span class="cx"> @ chmod( $new_file, $perms );
</span><span class="cx">
</span><del>- // Compute the URL
</del><ins>+ // Compute the URL.
</ins><span class="cx"> $url = $uploads['url'] . "/$filename";
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() )
</span><span class="lines">@@ -1051,7 +1057,7 @@
</span><span class="cx"> $credentials['public_key'] = defined('FTP_PUBKEY') ? FTP_PUBKEY : (!empty($_POST['public_key']) ? wp_unslash( $_POST['public_key'] ) : '');
</span><span class="cx"> $credentials['private_key'] = defined('FTP_PRIKEY') ? FTP_PRIKEY : (!empty($_POST['private_key']) ? wp_unslash( $_POST['private_key'] ) : '');
</span><span class="cx">
</span><del>- //sanitize the hostname, Some people might pass in odd-data:
</del><ins>+ // Sanitize the hostname, Some people might pass in odd-data:
</ins><span class="cx"> $credentials['hostname'] = preg_replace('|\w+://|', '', $credentials['hostname']); //Strip any schemes off
</span><span class="cx">
</span><span class="cx"> if ( strpos($credentials['hostname'], ':') ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/image-edit.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/image-edit.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/image-edit.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> if ( !is_array($changes) )
</span><span class="cx"> return $image;
</span><span class="cx">
</span><del>- // expand change operations
</del><ins>+ // Expand change operations.
</ins><span class="cx"> foreach ( $changes as $key => $obj ) {
</span><span class="cx"> if ( isset($obj->r) ) {
</span><span class="cx"> $obj->type = 'rotate';
</span><span class="lines">@@ -429,7 +429,7 @@
</span><span class="cx"> $changes[$key] = $obj;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // combine operations
</del><ins>+ // Combine operations.
</ins><span class="cx"> if ( count($changes) > 1 ) {
</span><span class="cx"> $filtered = array($changes[0]);
</span><span class="cx"> for ( $i = 0, $j = 1; $j < count($changes); $j++ ) {
</span><span class="lines">@@ -453,7 +453,7 @@
</span><span class="cx"> unset($filtered);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // image resource before applying the changes
</del><ins>+ // Image resource before applying the changes.
</ins><span class="cx"> if ( $image instanceof WP_Image_Editor ) {
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -540,7 +540,7 @@
</span><span class="cx"> if ( $changes )
</span><span class="cx"> $img = image_edit_apply_changes( $img, $changes );
</span><span class="cx">
</span><del>- // scale the image
</del><ins>+ // Scale the image.
</ins><span class="cx"> $size = $img->get_size();
</span><span class="cx"> $w = $size['width'];
</span><span class="cx"> $h = $size['height'];
</span><span class="lines">@@ -576,7 +576,8 @@
</span><span class="cx">
</span><span class="cx"> if ( $parts['basename'] != $data['file'] ) {
</span><span class="cx"> if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
</span><del>- // delete only if it's edited image
</del><ins>+
+ // Delete only if it's edited image.
</ins><span class="cx"> if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
</span><span class="cx">
</span><span class="cx"> /** This filter is documented in wp-admin/custom-header.php */
</span><span class="lines">@@ -601,7 +602,8 @@
</span><span class="cx"> $data = $backup_sizes["$default_size-orig"];
</span><span class="cx"> if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
</span><span class="cx"> if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) {
</span><del>- // delete only if it's edited image
</del><ins>+
+ // Delete only if it's edited image
</ins><span class="cx"> if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
</span><span class="cx"> /** This filter is documented in wp-admin/custom-header.php */
</span><span class="cx"> $delpath = apply_filters( 'wp_delete_file', path_join($parts['dirname'], $meta['sizes'][$default_size]['file']) );
</span><span class="lines">@@ -661,10 +663,10 @@
</span><span class="cx"> $sX = $size['width'];
</span><span class="cx"> $sY = $size['height'];
</span><span class="cx">
</span><del>- // check if it has roughly the same w / h ratio
</del><ins>+ // Check if it has roughly the same w / h ratio.
</ins><span class="cx"> $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);
</span><span class="cx"> if ( -0.1 < $diff && $diff < 0.1 ) {
</span><del>- // scale the full size image
</del><ins>+ // Scale the full size image.
</ins><span class="cx"> if ( $img->resize( $fwidth, $fheight ) )
</span><span class="cx"> $scaled = true;
</span><span class="cx"> }
</span><span class="lines">@@ -693,7 +695,7 @@
</span><span class="cx"> if ( !is_array($backup_sizes) )
</span><span class="cx"> $backup_sizes = array();
</span><span class="cx">
</span><del>- // generate new filename
</del><ins>+ // Generate new filename.
</ins><span class="cx"> $path = get_attached_file($post_id);
</span><span class="cx"> $path_parts = pathinfo( $path );
</span><span class="cx"> $filename = $path_parts['filename'];
</span><span class="lines">@@ -719,7 +721,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // save the full-size file, also needed to create sub-sizes
</del><ins>+ // Save the full-size file, also needed to create sub-sizes.
</ins><span class="cx"> if ( !wp_save_image_file($new_path, $img, $post->post_mime_type, $post_id) ) {
</span><span class="cx"> $return->error = esc_js( __('Unable to save the image.') );
</span><span class="cx"> return $return;
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/image.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/image.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/image.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -47,8 +47,10 @@
</span><span class="cx"> if ( ! $dst_file )
</span><span class="cx"> $dst_file = str_replace( basename( $src_file ), 'cropped-' . basename( $src_file ), $src_file );
</span><span class="cx">
</span><del>- // The directory containing the original file may no longer exist when
- // using a replication plugin.
</del><ins>+ /*
+ * The directory containing the original file may no longer exist when
+ * using a replication plugin.
+ */
</ins><span class="cx"> wp_mkdir_p( dirname( $dst_file ) );
</span><span class="cx">
</span><span class="cx"> $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
</span><span class="lines">@@ -79,10 +81,10 @@
</span><span class="cx"> $metadata['width'] = $imagesize[0];
</span><span class="cx"> $metadata['height'] = $imagesize[1];
</span><span class="cx">
</span><del>- // Make the file path relative to the upload dir
</del><ins>+ // Make the file path relative to the upload dir.
</ins><span class="cx"> $metadata['file'] = _wp_relative_upload_path($file);
</span><span class="cx">
</span><del>- // make thumbnails and other intermediate sizes
</del><ins>+ // Make thumbnails and other intermediate sizes.
</ins><span class="cx"> global $_wp_additional_image_sizes;
</span><span class="cx">
</span><span class="cx"> $sizes = array();
</span><span class="lines">@@ -120,7 +122,7 @@
</span><span class="cx"> $metadata['sizes'] = array();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // fetch additional metadata from exif/iptc
</del><ins>+ // Fetch additional metadata from EXIF/IPTC.
</ins><span class="cx"> $image_meta = wp_read_image_metadata( $file );
</span><span class="cx"> if ( $image_meta )
</span><span class="cx"> $metadata['image_meta'] = $image_meta;
</span><span class="lines">@@ -134,7 +136,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $support && ! empty( $metadata['image']['data'] ) ) {
</span><del>- // check for existing cover
</del><ins>+ // Check for existing cover.
</ins><span class="cx"> $hash = md5( $metadata['image']['data'] );
</span><span class="cx"> $posts = get_posts( array(
</span><span class="cx"> 'fields' => 'ids',
</span><span class="lines">@@ -187,7 +189,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // remove the blob of binary data from the array
</del><ins>+ // Remove the blob of binary data from the array.
</ins><span class="cx"> if ( isset( $metadata['image']['data'] ) )
</span><span class="cx"> unset( $metadata['image']['data'] );
</span><span class="cx">
</span><span class="lines">@@ -254,10 +256,12 @@
</span><span class="cx">
</span><span class="cx"> list( , , $sourceImageType ) = getimagesize( $file );
</span><span class="cx">
</span><del>- // exif contains a bunch of data we'll probably never need formatted in ways
- // that are difficult to use. We'll normalize it and just extract the fields
- // that are likely to be useful. Fractions and numbers are converted to
- // floats, dates to unix timestamps, and everything else to strings.
</del><ins>+ /*
+ * EXIF contains a bunch of data we'll probably never need formatted in ways
+ * that are difficult to use. We'll normalize it and just extract the fields
+ * that are likely to be useful. Fractions and numbers are converted to
+ * floats, dates to unix timestamps, and everything else to strings.
+ */
</ins><span class="cx"> $meta = array(
</span><span class="cx"> 'aperture' => 0,
</span><span class="cx"> 'credit' => '',
</span><span class="lines">@@ -271,20 +275,26 @@
</span><span class="cx"> 'title' => '',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // read iptc first, since it might contain data not available in exif such
- // as caption, description etc
</del><ins>+ /*
+ * Read IPTC first, since it might contain data not available in exif such
+ * as caption, description etc.
+ */
</ins><span class="cx"> if ( is_callable( 'iptcparse' ) ) {
</span><span class="cx"> getimagesize( $file, $info );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $info['APP13'] ) ) {
</span><span class="cx"> $iptc = iptcparse( $info['APP13'] );
</span><span class="cx">
</span><del>- // headline, "A brief synopsis of the caption."
- if ( ! empty( $iptc['2#105'][0] ) )
</del><ins>+ // Headline, "A brief synopsis of the caption."
+ if ( ! empty( $iptc['2#105'][0] ) ) {
</ins><span class="cx"> $meta['title'] = trim( $iptc['2#105'][0] );
</span><del>- // title, "Many use the Title field to store the filename of the image, though the field may be used in many ways."
- elseif ( ! empty( $iptc['2#005'][0] ) )
</del><ins>+ /*
+ * Title, "Many use the Title field to store the filename of the image,
+ * though the field may be used in many ways."
+ */
+ } elseif ( ! empty( $iptc['2#005'][0] ) ) {
</ins><span class="cx"> $meta['title'] = trim( $iptc['2#005'][0] );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $iptc['2#120'][0] ) ) { // description / legacy caption
</span><span class="cx"> $caption = trim( $iptc['2#120'][0] );
</span><span class="lines">@@ -568,8 +578,10 @@
</span><span class="cx"> $dst_file = str_replace( basename( $dst_file ), 'copy-' . basename( $dst_file ), $dst_file );
</span><span class="cx"> $dst_file = dirname( $dst_file ) . '/' . wp_unique_filename( dirname( $dst_file ), basename( $dst_file ) );
</span><span class="cx">
</span><del>- // The directory containing the original file may no longer exist when
- // using a replication plugin.
</del><ins>+ /*
+ * The directory containing the original file may no longer
+ * exist when using a replication plugin.
+ */
</ins><span class="cx"> wp_mkdir_p( dirname( $dst_file ) );
</span><span class="cx">
</span><span class="cx"> if ( ! @copy( $src_file, $dst_file ) )
</span></span></pre></div>
<a id="trunksrcwpadminincludesimportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/import.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/import.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/import.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -105,7 +105,10 @@
</span><span class="cx"> // Save the data
</span><span class="cx"> $id = wp_insert_attachment( $object, $file );
</span><span class="cx">
</span><del>- // schedule a cleanup for one day from now in case of failed import or missing wp_import_cleanup() call
</del><ins>+ /*
+ * Schedule a cleanup for one day from now in case of failed
+ * import or missing wp_import_cleanup() call.
+ */
</ins><span class="cx"> wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
</span><span class="cx">
</span><span class="cx"> return array( 'file' => $file, 'id' => $id );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/media.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/media.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/media.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -180,7 +180,8 @@
</span><span class="cx">
</span><span class="cx"> $caption = str_replace( array("\r\n", "\r"), "\n", $caption);
</span><span class="cx"> $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption );
</span><del>- // convert any remaining line breaks to <br>
</del><ins>+
+ // Convert any remaining line breaks to <br>.
</ins><span class="cx"> $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '<br />', $caption );
</span><span class="cx">
</span><span class="cx"> $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html );
</span><span class="lines">@@ -208,7 +209,7 @@
</span><span class="cx"> * @since 3.4.0
</span><span class="cx"> */
</span><span class="cx"> function _cleanup_image_add_caption( $matches ) {
</span><del>- // remove any line breaks from inside the tags
</del><ins>+ // Remove any line breaks from inside the tags.
</ins><span class="cx"> return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -317,7 +318,7 @@
</span><span class="cx"> if ( ! empty( $meta['genre'] ) )
</span><span class="cx"> $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
</span><span class="cx">
</span><del>- // use image exif/iptc data for title and caption defaults if possible
</del><ins>+ // Use image exif/iptc data for title and caption defaults if possible.
</ins><span class="cx"> } elseif ( $image_meta = @wp_read_image_metadata( $file ) ) {
</span><span class="cx"> if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
</span><span class="cx"> $title = $image_meta['title'];
</span><span class="lines">@@ -378,7 +379,7 @@
</span><span class="cx"> $title = preg_replace('/\.[^.]+$/', '', basename($file));
</span><span class="cx"> $content = '';
</span><span class="cx">
</span><del>- // use image exif/iptc data for title and caption defaults if possible
</del><ins>+ // Use image exif/iptc data for title and caption defaults if possible.
</ins><span class="cx"> if ( $image_meta = @wp_read_image_metadata($file) ) {
</span><span class="cx"> if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
</span><span class="cx"> $title = $image_meta['title'];
</span><span class="lines">@@ -389,7 +390,7 @@
</span><span class="cx"> if ( isset( $desc ) )
</span><span class="cx"> $title = $desc;
</span><span class="cx">
</span><del>- // Construct the attachment array
</del><ins>+ // Construct the attachment array.
</ins><span class="cx"> $attachment = array_merge( array(
</span><span class="cx"> 'post_mime_type' => $type,
</span><span class="cx"> 'guid' => $url,
</span><span class="lines">@@ -634,7 +635,8 @@
</span><span class="cx"> $image_alt = wp_unslash( $attachment['image_alt'] );
</span><span class="cx"> if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) {
</span><span class="cx"> $image_alt = wp_strip_all_tags( $image_alt, true );
</span><del>- // update_meta expects slashed
</del><ins>+
+ // Update_meta expects slashed.
</ins><span class="cx"> update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -807,11 +809,11 @@
</span><span class="cx"> */
</span><span class="cx"> function media_sideload_image( $file, $post_id, $desc = null ) {
</span><span class="cx"> if ( ! empty( $file ) ) {
</span><del>- // Set variables for storage
- // fix file filename for query strings
</del><ins>+ // Set variables for storage, fix file filename for query strings.
</ins><span class="cx"> preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
</span><span class="cx"> $file_array['name'] = basename( $matches[0] );
</span><del>- // Download file to temp location
</del><ins>+
+ // Download file to temp location.
</ins><span class="cx"> $file_array['tmp_name'] = download_url( $file );
</span><span class="cx">
</span><span class="cx"> // If error storing temporarily, return the error.
</span><span class="lines">@@ -819,9 +821,10 @@
</span><span class="cx"> return $file_array['tmp_name'];
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // do the validation and storage stuff
</del><ins>+ // Do the validation and storage stuff.
</ins><span class="cx"> $id = media_handle_sideload( $file_array, $post_id, $desc );
</span><del>- // If error storing permanently, unlink
</del><ins>+
+ // If error storing permanently, unlink.
</ins><span class="cx"> if ( is_wp_error( $id ) ) {
</span><span class="cx"> @unlink( $file_array['tmp_name'] );
</span><span class="cx"> return $id;
</span><span class="lines">@@ -830,7 +833,7 @@
</span><span class="cx"> $src = wp_get_attachment_url( $id );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Finally check to make sure the file has been saved, then return the html
</del><ins>+ // Finally check to make sure the file has been saved, then return the HTML.
</ins><span class="cx"> if ( ! empty( $src ) ) {
</span><span class="cx"> $alt = isset( $desc ) ? esc_attr( $desc ) : '';
</span><span class="cx"> $html = "<img src='$src' alt='$alt' />";
</span><span class="lines">@@ -943,17 +946,21 @@
</span><span class="cx"> $downsize = image_downsize($post->ID, $size);
</span><span class="cx"> $checked = '';
</span><span class="cx">
</span><del>- // is this size selectable?
</del><ins>+ // Is this size selectable?
</ins><span class="cx"> $enabled = ( $downsize[3] || 'full' == $size );
</span><span class="cx"> $css_id = "image-size-{$size}-{$post->ID}";
</span><del>- // if this size is the default but that's not available, don't select it
</del><ins>+
+ // If this size is the default but that's not available, don't select it.
</ins><span class="cx"> if ( $size == $check ) {
</span><span class="cx"> if ( $enabled )
</span><span class="cx"> $checked = " checked='checked'";
</span><span class="cx"> else
</span><span class="cx"> $check = '';
</span><span class="cx"> } elseif ( !$check && $enabled && 'thumbnail' != $size ) {
</span><del>- // if $check is not enabled, default to the first available size that's bigger than a thumbnail
</del><ins>+ /*
+ * If $check is not enabled, default to the first available size
+ * that's bigger than a thumbnail.
+ */
</ins><span class="cx"> $check = $size;
</span><span class="cx"> $checked = " checked='checked'";
</span><span class="cx"> }
</span><span class="lines">@@ -961,7 +968,8 @@
</span><span class="cx"> $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
</span><span class="cx">
</span><span class="cx"> $html .= "<label for='{$css_id}'>$label</label>";
</span><del>- // only show the dimensions if that choice is available
</del><ins>+
+ // Only show the dimensions if that choice is available.
</ins><span class="cx"> if ( $enabled )
</span><span class="cx"> $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). "</label>";
</span><span class="cx">
</span><span class="lines">@@ -1009,7 +1017,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function wp_caption_input_textarea($edit_post) {
</span><del>- // post data is already escaped
</del><ins>+ // Post data is already escaped.
</ins><span class="cx"> $name = "attachments[{$edit_post->ID}][post_excerpt]";
</span><span class="cx">
</span><span class="cx"> return '<textarea name="' . $name . '" id="' . $name . '">' . $edit_post->post_excerpt . '</textarea>';
</span><span class="lines">@@ -1472,10 +1480,10 @@
</span><span class="cx"> $item .= $field[ $field['input'] ];
</span><span class="cx"> elseif ( $field['input'] == 'textarea' ) {
</span><span class="cx"> if ( 'post_content' == $id && user_can_richedit() ) {
</span><del>- // sanitize_post() skips the post_content when user_can_richedit
</del><ins>+ // Sanitize_post() skips the post_content when user_can_richedit.
</ins><span class="cx"> $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
</span><span class="cx"> }
</span><del>- // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit()
</del><ins>+ // Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
</ins><span class="cx"> $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
</span><span class="cx"> } else {
</span><span class="cx"> $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
</span><span class="lines">@@ -1621,7 +1629,7 @@
</span><span class="cx"> $item .= $field[ $field['input'] ];
</span><span class="cx"> elseif ( $field['input'] == 'textarea' ) {
</span><span class="cx"> if ( 'post_content' == $id && user_can_richedit() ) {
</span><del>- // sanitize_post() skips the post_content when user_can_richedit
</del><ins>+ // sanitize_post() skips the post_content when user_can_richedit.
</ins><span class="cx"> $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
</span><span class="cx"> }
</span><span class="cx"> $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
</span><span class="lines">@@ -2852,7 +2860,7 @@
</span><span class="cx"> foreach ( $data[$version]['comments'] as $key => $list ) {
</span><span class="cx"> if ( ! empty( $list ) ) {
</span><span class="cx"> $metadata[$key] = reset( $list );
</span><del>- // fix bug in byte stream analysis
</del><ins>+ // Fix bug in byte stream analysis.
</ins><span class="cx"> if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
</span><span class="cx"> $metadata[$key] = 'Cop' . $metadata[$key];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/menu.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/menu.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/menu.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -97,8 +97,10 @@
</span><span class="cx"> $first_sub = array_shift($subs);
</span><span class="cx"> $old_parent = $data[2];
</span><span class="cx"> $new_parent = $first_sub[2];
</span><del>- // If the first submenu is not the same as the assigned parent,
- // make the first submenu the new parent.
</del><ins>+ /*
+ * If the first submenu is not the same as the assigned parent,
+ * make the first submenu the new parent.
+ */
</ins><span class="cx"> if ( $new_parent != $old_parent ) {
</span><span class="cx"> $_wp_real_parent_file[$old_parent] = $new_parent;
</span><span class="cx"> $menu[$id][2] = $new_parent;
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/misc.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/misc.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/misc.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -163,8 +163,10 @@
</span><span class="cx"> $home_path = get_home_path();
</span><span class="cx"> $htaccess_file = $home_path.'.htaccess';
</span><span class="cx">
</span><del>- // If the file doesn't already exist check for write access to the directory and whether we have some rules.
- // else check for write access to the file.
</del><ins>+ /*
+ * If the file doesn't already exist check for write access to the directory
+ * and whether we have some rules. Else check for write access to the file.
+ */
</ins><span class="cx"> if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) {
</span><span class="cx"> if ( got_mod_rewrite() ) {
</span><span class="cx"> $rules = explode( "\n", $wp_rewrite->mod_rewrite_rules() );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmsdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/ms-deprecated.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/ms-deprecated.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/ms-deprecated.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> */
</span><span class="cx"> function wpmu_menu() {
</span><span class="cx"> _deprecated_function(__FUNCTION__, '3.0' );
</span><del>- // deprecated. See #11763
</del><ins>+ // Deprecated. See #11763.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/nav-menu.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/nav-menu.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/nav-menu.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> $post_type = apply_filters( 'nav_menu_meta_box_object', $post_type );
</span><span class="cx"> if ( $post_type ) {
</span><span class="cx"> $id = $post_type->name;
</span><del>- // give pages a higher priority
</del><ins>+ // Give pages a higher priority.
</ins><span class="cx"> $priority = ( 'page' == $post_type->name ? 'core' : 'default' );
</span><span class="cx"> add_meta_box( "add-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_type );
</span><span class="cx"> }
</span><span class="lines">@@ -615,7 +615,7 @@
</span><span class="cx">
</span><span class="cx"> $post_type_name = $post_type['args']->name;
</span><span class="cx">
</span><del>- // paginate browsing for large numbers of post objects
</del><ins>+ // Paginate browsing for large numbers of post objects.
</ins><span class="cx"> $per_page = 50;
</span><span class="cx"> $pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="cx"> $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="lines">@@ -762,7 +762,10 @@
</span><span class="cx"> <?php
</span><span class="cx"> $args['walker'] = $walker;
</span><span class="cx">
</span><del>- // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
</del><ins>+ /*
+ * If we're dealing with pages, let's put a checkbox for the front
+ * page at the top of the list.
+ */
</ins><span class="cx"> if ( 'page' == $post_type_name ) {
</span><span class="cx"> $front_page = 'page' == get_option('show_on_front') ? (int) get_option( 'page_on_front' ) : 0;
</span><span class="cx"> if ( ! empty( $front_page ) ) {
</span><span class="lines">@@ -854,7 +857,7 @@
</span><span class="cx"> global $nav_menu_selected_id;
</span><span class="cx"> $taxonomy_name = $taxonomy['args']->name;
</span><span class="cx">
</span><del>- // paginate browsing for large numbers of objects
</del><ins>+ // Paginate browsing for large numbers of objects.
</ins><span class="cx"> $per_page = 50;
</span><span class="cx"> $pagenum = isset( $_REQUEST[$taxonomy_name . '-tab'] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="cx"> $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="lines">@@ -1045,21 +1048,26 @@
</span><span class="cx">
</span><span class="cx"> if ( 0 == $menu_id || is_nav_menu( $menu_id ) ) {
</span><span class="cx">
</span><del>- // Loop through all the menu items' POST values
</del><ins>+ // Loop through all the menu items' POST values.
</ins><span class="cx"> foreach( (array) $menu_data as $_possible_db_id => $_item_object_data ) {
</span><span class="cx"> if (
</span><del>- empty( $_item_object_data['menu-item-object-id'] ) && // checkbox is not checked
</del><ins>+ // Checkbox is not checked.
+ empty( $_item_object_data['menu-item-object-id'] ) &&
</ins><span class="cx"> (
</span><del>- ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
- in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
</del><ins>+ // And item type either isn't set.
+ ! isset( $_item_object_data['menu-item-type'] ) ||
+ // Or URL is the default.
+ in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) ||
</ins><span class="cx"> ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) || // or it's not a custom menu item (but not the custom home page)
</span><del>- ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
</del><ins>+ // Or it *is* a custom menu item that already exists.
+ ! empty( $_item_object_data['menu-item-db-id'] )
</ins><span class="cx"> )
</span><span class="cx"> ) {
</span><del>- continue; // then this potential menu item is not getting added to this menu
</del><ins>+ // Then this potential menu item is not getting added to this menu.
+ continue;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // if this possible menu item doesn't actually have a menu database ID yet
</del><ins>+ // If this possible menu item doesn't actually have a menu database ID yet.
</ins><span class="cx"> if (
</span><span class="cx"> empty( $_item_object_data['menu-item-db-id'] ) ||
</span><span class="cx"> ( 0 > $_possible_db_id ) ||
</span><span class="lines">@@ -1112,20 +1120,20 @@
</span><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // posts should show only published items
</del><ins>+ // Posts should show only published items.
</ins><span class="cx"> } elseif ( 'post' == $object->name ) {
</span><span class="cx"> $object->_default_query = array(
</span><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // cats should be in reverse chronological order
</del><ins>+ // Categories should be in reverse chronological order.
</ins><span class="cx"> } elseif ( 'category' == $object->name ) {
</span><span class="cx"> $object->_default_query = array(
</span><span class="cx"> 'orderby' => 'id',
</span><span class="cx"> 'order' => 'DESC',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // custom post types should show only published items
</del><ins>+ // Custom post types should show only published items.
</ins><span class="cx"> } else {
</span><span class="cx"> $object->_default_query = array(
</span><span class="cx"> 'post_status' => 'publish',
</span><span class="lines">@@ -1226,7 +1234,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
</span><span class="cx">
</span><del>- // delete orphaned draft menu items
</del><ins>+ // Delete orphaned draft menu items.
</ins><span class="cx"> $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">
</span><span class="cx"> foreach( (array) $menu_items_to_delete as $menu_item_id )
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/plugin-install.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/plugin-install.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/plugin-install.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -245,15 +245,18 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> */
</span><span class="cx"> function install_plugin_install_status($api, $loop = false) {
</span><del>- // this function is called recursively, $loop prevents further loops.
</del><ins>+ // This function is called recursively, $loop prevents further loops.
</ins><span class="cx"> if ( is_array($api) )
</span><span class="cx"> $api = (object) $api;
</span><span class="cx">
</span><del>- //Default to a "new" plugin
</del><ins>+ // Default to a "new" plugin
</ins><span class="cx"> $status = 'install';
</span><span class="cx"> $url = false;
</span><span class="cx">
</span><del>- //Check to see if this plugin is known to be installed, and has an update awaiting it.
</del><ins>+ /*
+ * Check to see if this plugin is known to be installed,
+ * and has an update awaiting it.
+ */
</ins><span class="cx"> $update_plugins = get_site_transient('update_plugins');
</span><span class="cx"> if ( isset( $update_plugins->response ) ) {
</span><span class="cx"> foreach ( (array)$update_plugins->response as $file => $plugin ) {
</span><span class="lines">@@ -438,7 +441,7 @@
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $api->ratings ) && array_sum( (array) $api->ratings ) > 0 ) {
</span><span class="cx"> foreach( $api->ratings as $key => $ratecount ) {
</span><del>- // avoid div-by-zero
</del><ins>+ // Avoid div-by-zero.
</ins><span class="cx"> $_rating = $api->num_ratings ? ( $ratecount / $api->num_ratings ) : 0;
</span><span class="cx"> ?>
</span><span class="cx"> <div class="counter-container">
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/plugin.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/plugin.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/plugin.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -851,7 +851,7 @@
</span><span class="cx"> */
</span><span class="cx"> function validate_active_plugins() {
</span><span class="cx"> $plugins = get_option( 'active_plugins', array() );
</span><del>- // validate vartype: array
</del><ins>+ // Validate vartype: array.
</ins><span class="cx"> if ( ! is_array( $plugins ) ) {
</span><span class="cx"> update_option( 'active_plugins', array() );
</span><span class="cx"> $plugins = array();
</span><span class="lines">@@ -867,7 +867,7 @@
</span><span class="cx">
</span><span class="cx"> $invalid = array();
</span><span class="cx">
</span><del>- // invalid plugins get deactivated
</del><ins>+ // Invalid plugins get deactivated.
</ins><span class="cx"> foreach ( $plugins as $plugin ) {
</span><span class="cx"> $result = validate_plugin( $plugin );
</span><span class="cx"> if ( is_wp_error( $result ) ) {
</span><span class="lines">@@ -1119,10 +1119,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If the parent doesn't already have a submenu, add a link to the parent
- // as the first item in the submenu. If the submenu file is the same as the
- // parent file someone is trying to link back to the parent manually. In
- // this case, don't automatically add a link back to avoid duplication.
</del><ins>+ /*
+ * If the parent doesn't already have a submenu, add a link to the parent
+ * as the first item in the submenu. If the submenu file is the same as the
+ * parent file someone is trying to link back to the parent manually. In
+ * this case, don't automatically add a link back to avoid duplication.
+ */
</ins><span class="cx"> if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
</span><span class="cx"> foreach ( (array)$menu as $parent_menu ) {
</span><span class="cx"> if ( $parent_menu[2] == $parent_slug && current_user_can( $parent_menu[1] ) )
</span><span class="lines">@@ -1137,11 +1139,15 @@
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><span class="cx"> $_registered_pages[$hookname] = true;
</span><del>- // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
</del><ins>+
+ /*
+ * Backward-compatibility for plugins using add_management page.
+ * See wp-admin/admin.php for redirect from edit.php to tools.php
+ */
</ins><span class="cx"> if ( 'tools.php' == $parent_slug )
</span><span class="cx"> $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
</span><span class="cx">
</span><del>- // No parent as top level
</del><ins>+ // No parent as top level.
</ins><span class="cx"> $_parent_pages[$menu_slug] = $parent_slug;
</span><span class="cx">
</span><span class="cx"> return $hookname;
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/post.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/post.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/post.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> $image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
</span><span class="cx"> if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
</span><span class="cx"> $image_alt = wp_strip_all_tags( $image_alt, true );
</span><del>- // update_meta expects slashed
</del><ins>+ // update_meta expects slashed.
</ins><span class="cx"> update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -740,9 +740,10 @@
</span><span class="cx"> $metavalue = trim( $metavalue );
</span><span class="cx">
</span><span class="cx"> if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
</span><del>- // We have a key/value pair. If both the select and the
- // input for the key have data, the input takes precedence:
-
</del><ins>+ /*
+ * We have a key/value pair. If both the select and the input
+ * for the key have data, the input takes precedence.
+ */
</ins><span class="cx"> if ( '#NONE#' != $metakeyselect )
</span><span class="cx"> $metakey = $metakeyselect;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/revision.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/revision.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/revision.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -177,8 +177,11 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If a post has been saved since the last revision (no revisioned fields were changed)
- // we may not have a "current" revision. Mark the latest revision as "current".
</del><ins>+ /*
+ * If a post has been saved since the last revision (no revisioned fields
+ * were changed), we may not have a "current" revision. Mark the latest
+ * revision as "current".
+ */
</ins><span class="cx"> if ( empty( $current_id ) ) {
</span><span class="cx"> if ( $revisions[ $revision->ID ]['autosave'] ) {
</span><span class="cx"> $revision = end( $revisions );
</span><span class="lines">@@ -192,7 +195,7 @@
</span><span class="cx"> $revisions[ $current_id ]['current'] = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Now, grab the initial diff
</del><ins>+ // Now, grab the initial diff.
</ins><span class="cx"> $compare_two_mode = is_numeric( $from );
</span><span class="cx"> if ( ! $compare_two_mode ) {
</span><span class="cx"> $found = array_search( $selected_revision_id, array_keys( $revisions ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/schema.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/schema.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/schema.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> KEY user_nicename (user_nicename)
</span><span class="cx"> ) $charset_collate;\n";
</span><span class="cx">
</span><del>- // usermeta
</del><ins>+ // Usermeta.
</ins><span class="cx"> $usermeta_table = "CREATE TABLE $wpdb->usermeta (
</span><span class="cx"> umeta_id bigint(20) unsigned NOT NULL auto_increment,
</span><span class="cx"> user_id bigint(20) unsigned NOT NULL default '0',
</span><span class="lines">@@ -522,10 +522,10 @@
</span><span class="cx"> if ( !empty($insert) )
</span><span class="cx"> $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
</span><span class="cx">
</span><del>- // in case it is set, but blank, update "home"
</del><ins>+ // In case it is set, but blank, update "home".
</ins><span class="cx"> if ( !__get_option('home') ) update_option('home', $guessurl);
</span><span class="cx">
</span><del>- // Delete unused options
</del><ins>+ // Delete unused options.
</ins><span class="cx"> $unusedoptions = array(
</span><span class="cx"> 'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory',
</span><span class="cx"> 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping',
</span><span class="lines">@@ -547,12 +547,14 @@
</span><span class="cx"> foreach ( $unusedoptions as $option )
</span><span class="cx"> delete_option($option);
</span><span class="cx">
</span><del>- // delete obsolete magpie stuff
</del><ins>+ // Delete obsolete magpie stuff.
</ins><span class="cx"> $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
</span><span class="cx">
</span><del>- // Deletes all expired transients.
- // The multi-table delete syntax is used to delete the transient record from table a,
- // and the corresponding transient_timeout record from table b.
</del><ins>+ /*
+ * Deletes all expired transients. The multi-table delete syntax is used
+ * to delete the transient record from table a, and the corresponding
+ * transient_timeout record from table b.
+ */
</ins><span class="cx"> $time = time();
</span><span class="cx"> $sql = "DELETE a, b FROM $wpdb->options a, $wpdb->options b
</span><span class="cx"> WHERE a.option_name LIKE %s
</span><span class="lines">@@ -819,8 +821,10 @@
</span><span class="cx"> $role->add_cap( 'list_users' );
</span><span class="cx"> $role->add_cap( 'remove_users' );
</span><span class="cx">
</span><del>- // Never used, will be removed. create_users or
- // promote_users is the capability you're looking for.
</del><ins>+ /*
+ * Never used, will be removed. create_users or promote_users
+ * is the capability you're looking for.
+ */
</ins><span class="cx"> $role->add_cap( 'add_users' );
</span><span class="cx">
</span><span class="cx"> $role->add_cap( 'promote_users' );
</span><span class="lines">@@ -863,7 +867,7 @@
</span><span class="cx"> if ( '' == $site_name )
</span><span class="cx"> $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
</span><span class="cx">
</span><del>- // check for network collision
</del><ins>+ // Check for network collision.
</ins><span class="cx"> if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
</span><span class="cx"> $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
</span><span class="cx">
</span><span class="lines">@@ -874,7 +878,7 @@
</span><span class="cx"> if ( $errors->get_error_code() )
</span><span class="cx"> return $errors;
</span><span class="cx">
</span><del>- // set up site tables
</del><ins>+ // Set up site tables.
</ins><span class="cx"> $template = get_option( 'template' );
</span><span class="cx"> $stylesheet = get_option( 'stylesheet' );
</span><span class="cx"> $allowed_themes = array( $stylesheet => true );
</span><span class="lines">@@ -920,13 +924,13 @@
</span><span class="cx"> --The Team @ SITE_NAME' );
</span><span class="cx">
</span><span class="cx"> $misc_exts = array(
</span><del>- // images
</del><ins>+ // Images.
</ins><span class="cx"> 'jpg', 'jpeg', 'png', 'gif',
</span><del>- // video
</del><ins>+ // Video.
</ins><span class="cx"> 'mov', 'avi', 'mpg', '3gp', '3g2',
</span><del>- // "audio"
</del><ins>+ // "audio".
</ins><span class="cx"> 'midi', 'mid',
</span><del>- // misc
</del><ins>+ // Miscellaneous.
</ins><span class="cx"> 'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key',
</span><span class="cx"> );
</span><span class="cx"> $audio_exts = wp_get_audio_extensions();
</span><span class="lines">@@ -981,9 +985,13 @@
</span><span class="cx"> }
</span><span class="cx"> $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
</span><span class="cx">
</span><del>- // When upgrading from single to multisite, assume the current site will become the main site of the network.
- // When using populate_network() to create another network in an existing multisite environment,
- // skip these steps since the main site of the new network has not yet been created.
</del><ins>+ /*
+ * When upgrading from single to multisite, assume the current site will
+ * become the main site of the network. When using populate_network()
+ * to create another network in an existing multisite environment, skip
+ * these steps since the main site of the new network has not yet been
+ * created.
+ */
</ins><span class="cx"> if ( ! is_multisite() ) {
</span><span class="cx"> $current_site = new stdClass;
</span><span class="cx"> $current_site->domain = $domain;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/template.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/template.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/template.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -583,10 +583,10 @@
</span><span class="cx">
</span><span class="cx"> if ( is_serialized( $entry['meta_value'] ) ) {
</span><span class="cx"> if ( is_serialized_string( $entry['meta_value'] ) ) {
</span><del>- // this is a serialized string, so we should display it
</del><ins>+ // This is a serialized string, so we should display it.
</ins><span class="cx"> $entry['meta_value'] = maybe_unserialize( $entry['meta_value'] );
</span><span class="cx"> } else {
</span><del>- // this is a serialized array/object so we should NOT display it
</del><ins>+ // This is a serialized array/object so we should NOT display it.
</ins><span class="cx"> --$count;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -716,6 +716,7 @@
</span><span class="cx"> if ( (int) $tab_index > 0 )
</span><span class="cx"> $tab_index_attribute = " tabindex=\"$tab_index\"";
</span><span class="cx">
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> // echo '<label for="timestamp" style="display: block;"><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp"'.$tab_index_attribute.' /> '.__( 'Edit timestamp' ).'</label><br />';
</span><span class="cx">
</span><span class="cx"> $time_adj = current_time('timestamp');
</span><span class="lines">@@ -940,23 +941,30 @@
</span><span class="cx"> // If core box previously deleted, don't add
</span><span class="cx"> if ( false === $wp_meta_boxes[$page][$a_context][$a_priority][$id] )
</span><span class="cx"> return;
</span><del>- // If box was added with default priority, give it core priority to maintain sort order
</del><ins>+
+ /*
+ * If box was added with default priority, give it core priority to
+ * maintain sort order.
+ */
</ins><span class="cx"> if ( 'default' == $a_priority ) {
</span><span class="cx"> $wp_meta_boxes[$page][$a_context]['core'][$id] = $wp_meta_boxes[$page][$a_context]['default'][$id];
</span><span class="cx"> unset($wp_meta_boxes[$page][$a_context]['default'][$id]);
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- // If no priority given and id already present, use existing priority
</del><ins>+ // If no priority given and id already present, use existing priority.
</ins><span class="cx"> if ( empty($priority) ) {
</span><span class="cx"> $priority = $a_priority;
</span><del>- // else if we're adding to the sorted priority, we don't know the title or callback. Grab them from the previously added context/priority.
</del><ins>+ /*
+ * Else, if we're adding to the sorted priority, we don't know the title
+ * or callback. Grab them from the previously added context/priority.
+ */
</ins><span class="cx"> } elseif ( 'sorted' == $priority ) {
</span><span class="cx"> $title = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['title'];
</span><span class="cx"> $callback = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['callback'];
</span><span class="cx"> $callback_args = $wp_meta_boxes[$page][$a_context][$a_priority][$id]['args'];
</span><span class="cx"> }
</span><del>- // An id can be in only one priority and one context
</del><ins>+ // An id can be in only one priority and one context.
</ins><span class="cx"> if ( $priority != $a_priority || $context != $a_context )
</span><span class="cx"> unset($wp_meta_boxes[$page][$a_context][$a_priority][$id]);
</span><span class="cx"> }
</span><span class="lines">@@ -1340,23 +1348,25 @@
</span><span class="cx"> function get_settings_errors( $setting = '', $sanitize = false ) {
</span><span class="cx"> global $wp_settings_errors;
</span><span class="cx">
</span><del>- // If $sanitize is true, manually re-run the sanitization for this option
- // This allows the $sanitize_callback from register_setting() to run, adding
- // any settings errors you want to show by default.
</del><ins>+ /*
+ * If $sanitize is true, manually re-run the sanitization for this option
+ * This allows the $sanitize_callback from register_setting() to run, adding
+ * any settings errors you want to show by default.
+ */
</ins><span class="cx"> if ( $sanitize )
</span><span class="cx"> sanitize_option( $setting, get_option( $setting ) );
</span><span class="cx">
</span><del>- // If settings were passed back from options.php then use them
</del><ins>+ // If settings were passed back from options.php then use them.
</ins><span class="cx"> if ( isset( $_GET['settings-updated'] ) && $_GET['settings-updated'] && get_transient( 'settings_errors' ) ) {
</span><span class="cx"> $wp_settings_errors = array_merge( (array) $wp_settings_errors, get_transient( 'settings_errors' ) );
</span><span class="cx"> delete_transient( 'settings_errors' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Check global in case errors have been added on this pageload
</del><ins>+ // Check global in case errors have been added on this pageload.
</ins><span class="cx"> if ( ! count( $wp_settings_errors ) )
</span><span class="cx"> return array();
</span><span class="cx">
</span><del>- // Filter the results to those of a specific setting if one was set
</del><ins>+ // Filter the results to those of a specific setting if one was set.
</ins><span class="cx"> if ( $setting ) {
</span><span class="cx"> $setting_errors = array();
</span><span class="cx"> foreach ( (array) $wp_settings_errors as $key => $details ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/update-core.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/update-core.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/update-core.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -1089,7 +1089,10 @@
</span><span class="cx"> return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list
</del><ins>+ /*
+ * Generate the $sub_skip_list for the subdirectory as a sub-set
+ * of the existing $skip_list.
+ */
</ins><span class="cx"> $sub_skip_list = array();
</span><span class="cx"> foreach ( $skip_list as $skip_item ) {
</span><span class="cx"> if ( 0 === strpos( $skip_item, $filename . '/' ) )
</span><span class="lines">@@ -1125,7 +1128,7 @@
</span><span class="cx"> if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // Load the updated default text localization domain for new strings
</del><ins>+ // Load the updated default text localization domain for new strings.
</ins><span class="cx"> load_default_textdomain();
</span><span class="cx">
</span><span class="cx"> // See do_core_upgrade()
</span><span class="lines">@@ -1141,7 +1144,7 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>- // Include admin-footer.php and exit
</del><ins>+ // Include admin-footer.php and exit.
</ins><span class="cx"> include(ABSPATH . 'wp-admin/admin-footer.php');
</span><span class="cx"> exit();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/upgrade.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/upgrade.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/upgrade.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -61,8 +61,10 @@
</span><span class="cx"> if ( ! $public )
</span><span class="cx"> update_option('default_pingback_flag', 0);
</span><span class="cx">
</span><del>- // Create default user. If the user already exists, the user tables are
- // being shared among blogs. Just set the role in that case.
</del><ins>+ /*
+ * Create default user. If the user already exists, the user tables are
+ * being shared among blogs. Just set the role in that case.
+ */
</ins><span class="cx"> $user_id = username_exists($user_name);
</span><span class="cx"> $user_password = trim($user_password);
</span><span class="cx"> $email_password = false;
</span><span class="lines">@@ -625,8 +627,10 @@
</span><span class="cx">
</span><span class="cx"> $active_plugins = __get_option('active_plugins');
</span><span class="cx">
</span><del>- // If plugins are not stored in an array, they're stored in the old
- // newline separated format. Convert to new format.
</del><ins>+ /*
+ * If plugins are not stored in an array, they're stored in the old
+ * newline separated format. Convert to new format.
+ */
</ins><span class="cx"> if ( !is_array( $active_plugins ) ) {
</span><span class="cx"> $active_plugins = explode("\n", trim($active_plugins));
</span><span class="cx"> update_option('active_plugins', $active_plugins);
</span><span class="lines">@@ -716,14 +720,16 @@
</span><span class="cx"> $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
</span><span class="cx"> $wpdb->show_errors();
</span><span class="cx">
</span><del>- // populate comment_count field of posts table
</del><ins>+ // Populate comment_count field of posts table.
</ins><span class="cx"> $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
</span><span class="cx"> if ( is_array( $comments ) )
</span><span class="cx"> foreach ($comments as $comment)
</span><span class="cx"> $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
</span><span class="cx">
</span><del>- // Some alpha versions used a post status of object instead of attachment and put
- // the mime type in post_type instead of post_mime_type.
</del><ins>+ /*
+ * Some alpha versions used a post status of object instead of attachment
+ * and put the mime type in post_type instead of post_mime_type.
+ */
</ins><span class="cx"> if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
</span><span class="cx"> $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
</span><span class="cx"> foreach ($objects as $object) {
</span><span class="lines">@@ -880,8 +886,10 @@
</span><span class="cx">
</span><span class="cx"> // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
</span><span class="cx"> if ( $wp_current_db_version < 3570 ) {
</span><del>- // Create link_category terms for link categories. Create a map of link cat IDs
- // to link_category terms.
</del><ins>+ /*
+ * Create link_category terms for link categories. Create a map of link
+ * cat IDs to link_category terms.
+ */
</ins><span class="cx"> $link_cat_id_map = array();
</span><span class="cx"> $default_link_cat = 0;
</span><span class="cx"> $tt_ids = array();
</span><span class="lines">@@ -989,7 +997,7 @@
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> */
</span><span class="cx"> function upgrade_old_slugs() {
</span><del>- // upgrade people who were using the Redirect Old Slugs plugin
</del><ins>+ // Upgrade people who were using the Redirect Old Slugs plugin.
</ins><span class="cx"> global $wpdb;
</span><span class="cx"> $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'");
</span><span class="cx"> }
</span><span class="lines">@@ -1304,11 +1312,13 @@
</span><span class="cx"> function upgrade_network() {
</span><span class="cx"> global $wp_current_db_version, $wpdb;
</span><span class="cx">
</span><del>- // Always
</del><ins>+ // Always.
</ins><span class="cx"> if ( is_main_network() ) {
</span><del>- // Deletes all expired transients.
- // The multi-table delete syntax is used to delete the transient record from table a,
- // and the corresponding transient_timeout record from table b.
</del><ins>+ /*
+ * Deletes all expired transients. The multi-table delete syntax is used
+ * to delete the transient record from table a, and the corresponding
+ * transient_timeout record from table b.
+ */
</ins><span class="cx"> $time = time();
</span><span class="cx"> $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b
</span><span class="cx"> WHERE a.meta_key LIKE %s
</span><span class="lines">@@ -1318,7 +1328,7 @@
</span><span class="cx"> $wpdb->query( $wpdb->prepare( $sql, $wpdb->esc_like( '_site_transient_' ) . '%', $wpdb->esc_like ( '_site_transient_timeout_' ) . '%', $time ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // 2.8
</del><ins>+ // 2.8.
</ins><span class="cx"> if ( $wp_current_db_version < 11549 ) {
</span><span class="cx"> $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
</span><span class="cx"> $active_sitewide_plugins = get_site_option( 'active_sitewide_plugins' );
</span><span class="lines">@@ -1415,9 +1425,11 @@
</span><span class="cx"> if ( $wpdb->get_var( $query ) == $table_name ) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>- //didn't find it try to create it.
</del><ins>+
+ // Didn't find it try to create it..
</ins><span class="cx"> $wpdb->query($create_ddl);
</span><del>- // we cannot directly tell that whether this succeeded!
</del><ins>+
+ // We cannot directly tell that whether this succeeded!
</ins><span class="cx"> if ( $wpdb->get_var( $query ) == $table_name ) {
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -1478,9 +1490,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- //didn't find it try to create it.
</del><ins>+
+ // Didn't find it try to create it.
</ins><span class="cx"> $wpdb->query($create_ddl);
</span><del>- // we cannot directly tell that whether this succeeded!
</del><ins>+
+ // We cannot directly tell that whether this succeeded!
</ins><span class="cx"> foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
</span><span class="cx"> if ($column == $column_name) {
</span><span class="cx"> return true;
</span><span class="lines">@@ -1551,12 +1565,16 @@
</span><span class="cx"> function deslash($content) {
</span><span class="cx"> // Note: \\\ inside a regex denotes a single backslash.
</span><span class="cx">
</span><del>- // Replace one or more backslashes followed by a single quote with
- // a single quote.
</del><ins>+ /*
+ * Replace one or more backslashes followed by a single quote with
+ * a single quote.
+ */
</ins><span class="cx"> $content = preg_replace("/\\\+'/", "'", $content);
</span><span class="cx">
</span><del>- // Replace one or more backslashes followed by a double quote with
- // a double quote.
</del><ins>+ /*
+ * Replace one or more backslashes followed by a double quote with
+ * a double quote.
+ */
</ins><span class="cx"> $content = preg_replace('/\\\+"/', '"', $content);
</span><span class="cx">
</span><span class="cx"> // Replace one or more backslashes with one backslash.
</span><span class="lines">@@ -1655,24 +1673,27 @@
</span><span class="cx"> if ( ! $tablefields )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // Clear the field and index arrays
</del><ins>+ // Clear the field and index arrays.
</ins><span class="cx"> $cfields = $indices = array();
</span><del>- // Get all of the field names in the query from between the parens
</del><ins>+
+ // Get all of the field names in the query from between the parentheses.
</ins><span class="cx"> preg_match("|\((.*)\)|ms", $qry, $match2);
</span><span class="cx"> $qryline = trim($match2[1]);
</span><span class="cx">
</span><del>- // Separate field lines into an array
</del><ins>+ // Separate field lines into an array.
</ins><span class="cx"> $flds = explode("\n", $qryline);
</span><span class="cx">
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> //echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
</span><span class="cx">
</span><del>- // For every field line specified in the query
</del><ins>+ // For every field line specified in the query.
</ins><span class="cx"> foreach ($flds as $fld) {
</span><del>- // Extract the field name
</del><ins>+
+ // Extract the field name.
</ins><span class="cx"> preg_match("|^([^ ]*)|", trim($fld), $fvals);
</span><span class="cx"> $fieldname = trim( $fvals[1], '`' );
</span><span class="cx">
</span><del>- // Verify the found field name
</del><ins>+ // Verify the found field name.
</ins><span class="cx"> $validfield = true;
</span><span class="cx"> switch (strtolower($fieldname)) {
</span><span class="cx"> case '':
</span><span class="lines">@@ -1687,17 +1708,19 @@
</span><span class="cx"> }
</span><span class="cx"> $fld = trim($fld);
</span><span class="cx">
</span><del>- // If it's a valid field, add it to the field array
</del><ins>+ // If it's a valid field, add it to the field array.
</ins><span class="cx"> if ($validfield) {
</span><span class="cx"> $cfields[strtolower($fieldname)] = trim($fld, ", \n");
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For every field in the table
</del><ins>+ // For every field in the table.
</ins><span class="cx"> foreach ($tablefields as $tablefield) {
</span><del>- // If the table field exists in the field array...
</del><ins>+
+ // If the table field exists in the field array ...
</ins><span class="cx"> if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
</span><del>- // Get the field type from the query
</del><ins>+
+ // Get the field type from the query.
</ins><span class="cx"> preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
</span><span class="cx"> $fieldtype = $matches[1];
</span><span class="cx">
</span><span class="lines">@@ -1709,6 +1732,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get the default value from the array
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
</span><span class="cx"> if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
</span><span class="cx"> $default_value = $matches[1];
</span><span class="lines">@@ -1719,39 +1743,40 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Remove the field from the array (so it's not added)
</del><ins>+ // Remove the field from the array (so it's not added).
</ins><span class="cx"> unset($cfields[strtolower($tablefield->Field)]);
</span><span class="cx"> } else {
</span><span class="cx"> // This field exists in the table, but not in the creation queries?
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For every remaining field specified for the table
</del><ins>+ // For every remaining field specified for the table.
</ins><span class="cx"> foreach ($cfields as $fieldname => $fielddef) {
</span><del>- // Push a query line into $cqueries that adds the field to that table
</del><ins>+ // Push a query line into $cqueries that adds the field to that table.
</ins><span class="cx"> $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
</span><span class="cx"> $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Index stuff goes here
- // Fetch the table index structure from the database
</del><ins>+ // Index stuff goes here. Fetch the table index structure from the database.
</ins><span class="cx"> $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
</span><span class="cx">
</span><span class="cx"> if ($tableindices) {
</span><del>- // Clear the index array
</del><ins>+ // Clear the index array.
</ins><span class="cx"> unset($index_ary);
</span><span class="cx">
</span><del>- // For every index in the table
</del><ins>+ // For every index in the table.
</ins><span class="cx"> foreach ($tableindices as $tableindex) {
</span><del>- // Add the index to the index data array
</del><ins>+
+ // Add the index to the index data array.
</ins><span class="cx"> $keyname = $tableindex->Key_name;
</span><span class="cx"> $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
</span><span class="cx"> $index_ary[$keyname]['unique'] = ($tableindex->Non_unique == 0)?true:false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For each actual index in the index array
</del><ins>+ // For each actual index in the index array.
</ins><span class="cx"> foreach ($index_ary as $index_name => $index_data) {
</span><del>- // Build a create string to compare to the query
</del><ins>+
+ // Build a create string to compare to the query.
</ins><span class="cx"> $index_string = '';
</span><span class="cx"> if ($index_name == 'PRIMARY') {
</span><span class="cx"> $index_string .= 'PRIMARY ';
</span><span class="lines">@@ -1763,39 +1788,44 @@
</span><span class="cx"> $index_string .= $index_name;
</span><span class="cx"> }
</span><span class="cx"> $index_columns = '';
</span><del>- // For each column in the index
</del><ins>+
+ // For each column in the index.
</ins><span class="cx"> foreach ($index_data['columns'] as $column_data) {
</span><span class="cx"> if ($index_columns != '') $index_columns .= ',';
</span><del>- // Add the field to the column list string
</del><ins>+
+ // Add the field to the column list string.
</ins><span class="cx"> $index_columns .= $column_data['fieldname'];
</span><span class="cx"> if ($column_data['subpart'] != '') {
</span><span class="cx"> $index_columns .= '('.$column_data['subpart'].')';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- // Add the column list to the index create string
</del><ins>+ // Add the column list to the index create string.
</ins><span class="cx"> $index_string .= ' ('.$index_columns.')';
</span><span class="cx"> if (!(($aindex = array_search($index_string, $indices)) === false)) {
</span><span class="cx"> unset($indices[$aindex]);
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
</span><span class="cx"> }
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // For every remaining index specified for the table
</del><ins>+ // For every remaining index specified for the table.
</ins><span class="cx"> foreach ( (array) $indices as $index ) {
</span><del>- // Push a query line into $cqueries that adds the index to that table
</del><ins>+ // Push a query line into $cqueries that adds the index to that table.
</ins><span class="cx"> $cqueries[] = "ALTER TABLE {$table} ADD $index";
</span><span class="cx"> $for_update[] = 'Added index ' . $table . ' ' . $index;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Remove the original table creation query from processing
</del><ins>+ // Remove the original table creation query from processing.
</ins><span class="cx"> unset( $cqueries[ $table ], $for_update[ $table ] );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $allqueries = array_merge($cqueries, $iqueries);
</span><span class="cx"> if ($execute) {
</span><span class="cx"> foreach ($allqueries as $query) {
</span><ins>+ // todo: Remove this?
</ins><span class="cx"> //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">".print_r($query, true)."</pre>\n";
</span><span class="cx"> $wpdb->query($query);
</span><span class="cx"> }
</span><span class="lines">@@ -1847,9 +1877,10 @@
</span><span class="cx"> if (! file_exists("$home_path/index.php"))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Copy files from the old locations to the site theme.
- // TODO: This does not copy arbitrary include dependencies. Only the
- // standard WP files are copied.
</del><ins>+ /*
+ * Copy files from the old locations to the site theme.
+ * TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied.
+ */
</ins><span class="cx"> $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
</span><span class="cx">
</span><span class="cx"> foreach ($files as $oldfile => $newfile) {
</span><span class="lines">@@ -1858,12 +1889,15 @@
</span><span class="cx"> else
</span><span class="cx"> $oldpath = ABSPATH;
</span><span class="cx">
</span><del>- if ($oldfile == 'index.php') { // Check to make sure it's not a new index
</del><ins>+ // Check to make sure it's not a new index.
+ if ($oldfile == 'index.php') {
</ins><span class="cx"> $index = implode('', file("$oldpath/$oldfile"));
</span><span class="cx"> if (strpos($index, 'WP_USE_THEMES') !== false) {
</span><span class="cx"> if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
</span><span class="cx"> return false;
</span><del>- continue; // Don't copy anything
</del><ins>+
+ // Don't copy anything.
+ continue;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/user.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/user.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/user.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -390,10 +390,11 @@
</span><span class="cx"> */
</span><span class="cx"> function default_password_nag_handler($errors = false) {
</span><span class="cx"> global $user_ID;
</span><del>- if ( ! get_user_option('default_password_nag') ) //Short circuit it.
</del><ins>+ // Short-circuit it.
+ if ( ! get_user_option('default_password_nag') )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- //get_user_setting = JS saved UI setting. else no-js-fallback code.
</del><ins>+ // get_user_setting = JS saved UI setting. else no-js-fallback code.
</ins><span class="cx"> if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
</span><span class="cx"> delete_user_setting('default_password_nag');
</span><span class="cx"> update_user_option($user_ID, 'default_password_nag', false, true);
</span><span class="lines">@@ -401,28 +402,33 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> function default_password_nag_edit_user($user_ID, $old_data) {
</span><del>- if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
</del><ins>+ // Short-circuit it.
+ if ( ! get_user_option('default_password_nag', $user_ID) )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $new_data = get_userdata($user_ID);
</span><span class="cx">
</span><del>- if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
</del><ins>+ // Remove the nag if the password has been changed.
+ if ( $new_data->user_pass != $old_data->user_pass ) {
</ins><span class="cx"> delete_user_setting('default_password_nag');
</span><span class="cx"> update_user_option($user_ID, 'default_password_nag', false, true);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_action('admin_notices', 'default_password_nag');
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> */
</span><span class="cx"> function default_password_nag() {
</span><span class="cx"> global $pagenow;
</span><del>- if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) //Short circuit it.
</del><ins>+ // Short-circuit it.
+ if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> echo '<div class="error default-password-nag">';
</span></span></pre></div>
<a id="trunksrcwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/widgets.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/widgets.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/includes/widgets.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -173,11 +173,14 @@
</span><span class="cx"> $query_arg['key'] = $key;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // We aren't showing a widget control, we're outputting a template for a multi-widget control
</del><ins>+ /*
+ * We aren't showing a widget control, we're outputting a template
+ * for a multi-widget control.
+ */
</ins><span class="cx"> if ( isset($sidebar_args['_display']) && 'template' == $sidebar_args['_display'] && $widget_number ) {
</span><span class="cx"> // number == -1 implies a template where id numbers are replaced by a generic '__i__'
</span><span class="cx"> $control['params'][0]['number'] = -1;
</span><del>- // with id_base widget id's are constructed like {$id_base}-{$id_number}
</del><ins>+ // With id_base widget id's are constructed like {$id_base}-{$id_number}.
</ins><span class="cx"> if ( isset($control['id_base']) )
</span><span class="cx"> $id_format = $control['id_base'] . '-__i__';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadmininstallhelperphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install-helper.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install-helper.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/install-helper.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -57,9 +57,10 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- //didn't find it try to create it.
</del><ins>+ // Didn't find it, so try to create it.
</ins><span class="cx"> $wpdb->query($create_ddl);
</span><del>- // we cannot directly tell that whether this succeeded!
</del><ins>+
+ // We cannot directly tell that whether this succeeded!
</ins><span class="cx"> foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
</span><span class="cx"> if ($table == $table_name) {
</span><span class="cx"> return true;
</span><span class="lines">@@ -90,9 +91,11 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- //didn't find it try to create it.
</del><ins>+
+ // Didn't find it, so try to create it.
</ins><span class="cx"> $wpdb->query($create_ddl);
</span><del>- // we cannot directly tell that whether this succeeded!
</del><ins>+
+ // We cannot directly tell that whether this succeeded!
</ins><span class="cx"> foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
</span><span class="cx"> if ($column == $column_name) {
</span><span class="cx"> return true;
</span><span class="lines">@@ -118,9 +121,11 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
</span><span class="cx"> if ($column == $column_name) {
</span><del>- //found it try to drop it.
</del><ins>+
+ // Found it, so try to drop it.
</ins><span class="cx"> $wpdb->query($drop_ddl);
</span><del>- // we cannot directly tell that whether this succeeded!
</del><ins>+
+ // We cannot directly tell that whether this succeeded!
</ins><span class="cx"> foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
</span><span class="cx"> if ($column == $column_name) {
</span><span class="cx"> return false;
</span><span class="lines">@@ -128,7 +133,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- // else didn't find it
</del><ins>+ // Else didn't find it.
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -167,7 +172,8 @@
</span><span class="cx"> foreach ($results as $row ) {
</span><span class="cx">
</span><span class="cx"> if ($row->Field == $col_name) {
</span><del>- // got our column, check the params
</del><ins>+
+ // Got our column, check the params.
</ins><span class="cx"> if (($col_type != null) && ($row->Type != $col_type)) {
</span><span class="cx"> ++$diffs;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/install.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/install.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/install.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -222,7 +222,8 @@
</span><span class="cx"> $admin_password_check = isset($_POST['admin_password2']) ? wp_unslash( $_POST['admin_password2'] ) : '';
</span><span class="cx"> $admin_email = isset( $_POST['admin_email'] ) ?trim( wp_unslash( $_POST['admin_email'] ) ) : '';
</span><span class="cx"> $public = isset( $_POST['blog_public'] ) ? (int) $_POST['blog_public'] : 0;
</span><del>- // check e-mail address
</del><ins>+
+ // Check e-mail address.
</ins><span class="cx"> $error = false;
</span><span class="cx"> if ( empty( $user_name ) ) {
</span><span class="cx"> // TODO: poka-yoke
</span></span></pre></div>
<a id="trunksrcwpadminlinkparseopmlphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/link-parse-opml.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/link-parse-opml.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/link-parse-opml.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -45,13 +45,14 @@
</span><span class="cx"> if ( isset( $attrs['HTMLURL'] ) ) {
</span><span class="cx"> $url = $attrs['HTMLURL'];
</span><span class="cx"> }
</span><del>- // save the data away.
</del><ins>+
+ // Save the data away.
</ins><span class="cx"> $names[] = $name;
</span><span class="cx"> $urls[] = $url;
</span><span class="cx"> $targets[] = isset( $attrs['TARGET'] ) ? $attrs['TARGET'] : '';
</span><span class="cx"> $feeds[] = isset( $attrs['XMLURL'] ) ? $attrs['XMLURL'] : '';
</span><span class="cx"> $descriptions[] = isset( $attrs['DESCRIPTION'] ) ? $attrs['DESCRIPTION'] : '';
</span><del>- } // end if outline
</del><ins>+ } // End if outline.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> * @param string $tagName XML tag name.
</span><span class="cx"> */
</span><span class="cx"> function endElement($parser, $tagName) {
</span><del>- // nothing to do.
</del><ins>+ // Nothing to do.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Create an XML parser
</span></span></pre></div>
<a id="trunksrcwpadminlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/link.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/link.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/link.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> case 'deletebookmarks' :
</span><span class="cx"> check_admin_referer('bulk-bookmarks');
</span><span class="cx">
</span><del>- //for each link id (in $linkcheck[]) change category to selected value
</del><ins>+ // For each link id (in $linkcheck[]) change category to selected value.
</ins><span class="cx"> if (count($linkcheck) == 0) {
</span><span class="cx"> wp_redirect($this_file);
</span><span class="cx"> exit;
</span><span class="lines">@@ -50,14 +50,16 @@
</span><span class="cx"> case 'move' :
</span><span class="cx"> check_admin_referer('bulk-bookmarks');
</span><span class="cx">
</span><del>- //for each link id (in $linkcheck[]) change category to selected value
</del><ins>+ // For each link id (in $linkcheck[]) change category to selected value.
</ins><span class="cx"> if (count($linkcheck) == 0) {
</span><span class="cx"> wp_redirect($this_file);
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx"> $all_links = join(',', $linkcheck);
</span><del>- // should now have an array of links we can change
- //$q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
</del><ins>+ /*
+ * Should now have an array of links we can change:
+ * $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
+ */
</ins><span class="cx">
</span><span class="cx"> wp_redirect($this_file);
</span><span class="cx"> exit;
</span></span></pre></div>
<a id="trunksrcwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/media-upload.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/media-upload.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/media-upload.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> $ID = isset($ID) ? (int) $ID : 0;
</span><span class="cx"> $post_id = isset($post_id)? (int) $post_id : 0;
</span><span class="cx">
</span><del>-// Require an ID for the edit screen
</del><ins>+// Require an ID for the edit screen.
</ins><span class="cx"> if ( isset($action) && $action == 'edit' && !$ID )
</span><span class="cx"> wp_die( __( 'Cheatin’ uh?' ) );
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) )
</span><span class="cx"> wp_die( __( 'Cheatin’ uh?' ) );
</span><span class="cx">
</span><del>- // upload type: image, video, file, ..?
</del><ins>+ // Upload type: image, video, file, ..?
</ins><span class="cx"> if ( isset($_GET['type']) ) {
</span><span class="cx"> $type = strval($_GET['type']);
</span><span class="cx"> } else {
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> $type = apply_filters( 'media_upload_default_type', 'file' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // tab: gallery, library, or type-specific
</del><ins>+ // Tab: gallery, library, or type-specific.
</ins><span class="cx"> if ( isset($_GET['tab']) ) {
</span><span class="cx"> $tab = strval($_GET['tab']);
</span><span class="cx"> } else {
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> $body_id = 'media-upload';
</span><span class="cx">
</span><del>- // let the action code decide how to handle the request
</del><ins>+ // Let the action code decide how to handle the request.
</ins><span class="cx"> if ( $tab == 'type' || $tab == 'type_url' || ! array_key_exists( $tab , media_upload_tabs() ) ) {
</span><span class="cx"> /**
</span><span class="cx"> * Fires inside specific upload-type views in the legacy (pre-3.5.0)
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/media.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/media.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/media.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> exit;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // no break
</del><ins>+ // No break.
</ins><span class="cx"> case 'edit' :
</span><span class="cx"> $title = __('Edit Media');
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu-header.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu-header.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/menu-header.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -80,9 +80,12 @@
</span><span class="cx"> $img = $img_style = '';
</span><span class="cx"> $img_class = ' dashicons-before';
</span><span class="cx">
</span><del>- // if the string 'none' (previously 'div') is passed instead of an URL, don't output the default menu image
- // so an icon can be added to div.wp-menu-image as background with CSS.
- // Dashicons and base64-encoded data:image/svg_xml URIs are also handled as special cases.
</del><ins>+ /*
+ * If the string 'none' (previously 'div') is passed instead of an URL, don't output
+ * the default menu image so an icon can be added to div.wp-menu-image as background
+ * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
+ * as special cases.
+ */
</ins><span class="cx"> if ( ! empty( $item[6] ) ) {
</span><span class="cx"> $img = '<img src="' . $item[6] . '" alt="" />';
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/menu.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/menu.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/menu.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -121,7 +121,10 @@
</span><span class="cx"> $ptype_class = 'post';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // if $ptype_menu_position is already populated or will be populated by a hard-coded value below, increment the position.
</del><ins>+ /*
+ * If $ptype_menu_position is already populated or will be populated
+ * by a hard-coded value below, increment the position.
+ */
</ins><span class="cx"> $core_menu_positions = array(59, 60, 65, 70, 75, 80, 85, 99);
</span><span class="cx"> while ( isset($menu[$ptype_menu_position]) || in_array($ptype_menu_position, $core_menu_positions) )
</span><span class="cx"> $ptype_menu_position++;
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/nav-menus.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/nav-menus.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/nav-menus.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -53,7 +53,8 @@
</span><span class="cx"> wp_save_nav_menu_items( $nav_menu_selected_id, $_REQUEST['menu-item'] );
</span><span class="cx"> break;
</span><span class="cx"> case 'move-down-menu-item' :
</span><del>- // moving down a menu item is the same as moving up the next in order
</del><ins>+
+ // Moving down a menu item is the same as moving up the next in order.
</ins><span class="cx"> check_admin_referer( 'move-menu_item' );
</span><span class="cx"> $menu_item_id = isset( $_REQUEST['menu-item'] ) ? (int) $_REQUEST['menu-item'] : 0;
</span><span class="cx"> if ( is_nav_menu_item( $menu_item_id ) ) {
</span><span class="lines">@@ -63,7 +64,7 @@
</span><span class="cx"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="cx"> $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
</span><span class="cx">
</span><del>- // set up the data we need in one pass through the array of menu items
</del><ins>+ // Set up the data we need in one pass through the array of menu items.
</ins><span class="cx"> $dbids_to_orders = array();
</span><span class="cx"> $orders_to_dbids = array();
</span><span class="cx"> foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span><span class="lines">@@ -75,14 +76,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // get next in order
</del><ins>+ // Get next in order.
</ins><span class="cx"> if (
</span><span class="cx"> isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1] )
</span><span class="cx"> ) {
</span><span class="cx"> $next_item_id = $orders_to_dbids[$dbids_to_orders[$menu_item_id] + 1];
</span><span class="cx"> $next_item_data = (array) wp_setup_nav_menu_item( get_post( $next_item_id ) );
</span><span class="cx">
</span><del>- // if not siblings of same parent, bubble menu item up but keep order
</del><ins>+ // If not siblings of same parent, bubble menu item up but keep order.
</ins><span class="cx"> if (
</span><span class="cx"> ! empty( $menu_item_data['menu_item_parent'] ) &&
</span><span class="cx"> (
</span><span class="lines">@@ -102,7 +103,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // make menu item a child of its next sibling
</del><ins>+ // Make menu item a child of its next sibling.
</ins><span class="cx"> } else {
</span><span class="cx"> $next_item_data['menu_order'] = $next_item_data['menu_order'] - 1;
</span><span class="cx"> $menu_item_data['menu_order'] = $menu_item_data['menu_order'] + 1;
</span><span class="lines">@@ -114,7 +115,7 @@
</span><span class="cx"> wp_update_post($next_item_data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // the item is last but still has a parent, so bubble up
</del><ins>+ // The item is last but still has a parent, so bubble up.
</ins><span class="cx"> } elseif (
</span><span class="cx"> ! empty( $menu_item_data['menu_item_parent'] ) &&
</span><span class="cx"> in_array( $menu_item_data['menu_item_parent'], $orders_to_dbids )
</span><span class="lines">@@ -136,7 +137,7 @@
</span><span class="cx"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="cx"> $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
</span><span class="cx">
</span><del>- // set up the data we need in one pass through the array of menu items
</del><ins>+ // Set up the data we need in one pass through the array of menu items.
</ins><span class="cx"> $dbids_to_orders = array();
</span><span class="cx"> $orders_to_dbids = array();
</span><span class="cx"> foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span><span class="lines">@@ -148,10 +149,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // if this menu item is not first
</del><ins>+ // If this menu item is not first.
</ins><span class="cx"> if ( ! empty( $dbids_to_orders[$menu_item_id] ) && ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
</span><span class="cx">
</span><del>- // if this menu item is a child of the previous
</del><ins>+ // If this menu item is a child of the previous.
</ins><span class="cx"> if (
</span><span class="cx"> ! empty( $menu_item_data['menu_item_parent'] ) &&
</span><span class="cx"> in_array( $menu_item_data['menu_item_parent'], array_keys( $dbids_to_orders ) ) &&
</span><span class="lines">@@ -164,7 +165,10 @@
</span><span class="cx"> if ( ! is_wp_error( $parent_object ) ) {
</span><span class="cx"> $parent_data = (array) $parent_object;
</span><span class="cx">
</span><del>- // if there is something before the parent and parent a child of it, make menu item a child also of it
</del><ins>+ /*
+ * If there is something before the parent and parent a child of it,
+ * make menu item a child also of it.
+ */
</ins><span class="cx"> if (
</span><span class="cx"> ! empty( $dbids_to_orders[$parent_db_id] ) &&
</span><span class="cx"> ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) &&
</span><span class="lines">@@ -172,7 +176,10 @@
</span><span class="cx"> ) {
</span><span class="cx"> $menu_item_data['menu_item_parent'] = $parent_data['menu_item_parent'];
</span><span class="cx">
</span><del>- // else if there is something before parent and parent not a child of it, make menu item a child of that something's parent
</del><ins>+ /*
+ * Else if there is something before parent and parent not a child of it,
+ * make menu item a child of that something's parent
+ */
</ins><span class="cx"> } elseif (
</span><span class="cx"> ! empty( $dbids_to_orders[$parent_db_id] ) &&
</span><span class="cx"> ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] )
</span><span class="lines">@@ -183,24 +190,24 @@
</span><span class="cx"> else
</span><span class="cx"> $menu_item_data['menu_item_parent'] = 0;
</span><span class="cx">
</span><del>- // else there isn't something before the parent
</del><ins>+ // Else there isn't something before the parent.
</ins><span class="cx"> } else {
</span><span class="cx"> $menu_item_data['menu_item_parent'] = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // set former parent's [menu_order] to that of menu-item's
</del><ins>+ // Set former parent's [menu_order] to that of menu-item's.
</ins><span class="cx"> $parent_data['menu_order'] = $parent_data['menu_order'] + 1;
</span><span class="cx">
</span><del>- // set menu-item's [menu_order] to that of former parent
</del><ins>+ // Set menu-item's [menu_order] to that of former parent.
</ins><span class="cx"> $menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
</span><span class="cx">
</span><del>- // save changes
</del><ins>+ // Save changes.
</ins><span class="cx"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx"> wp_update_post($menu_item_data);
</span><span class="cx"> wp_update_post($parent_data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // else this menu item is not a child of the previous
</del><ins>+ // Else this menu item is not a child of the previous.
</ins><span class="cx"> } elseif (
</span><span class="cx"> empty( $menu_item_data['menu_order'] ) ||
</span><span class="cx"> empty( $menu_item_data['menu_item_parent'] ) ||
</span><span class="lines">@@ -208,7 +215,7 @@
</span><span class="cx"> empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ||
</span><span class="cx"> $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] != $menu_item_data['menu_item_parent']
</span><span class="cx"> ) {
</span><del>- // just make it a child of the previous; keep the order
</del><ins>+ // Just make it a child of the previous; keep the order.
</ins><span class="cx"> $menu_item_data['menu_item_parent'] = (int) $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1];
</span><span class="cx"> update_post_meta( $menu_item_data['ID'], '_menu_item_menu_item_parent', (int) $menu_item_data['menu_item_parent'] );
</span><span class="cx"> wp_update_post($menu_item_data);
</span><span class="lines">@@ -232,7 +239,7 @@
</span><span class="cx"> if ( is_nav_menu( $nav_menu_selected_id ) ) {
</span><span class="cx"> $deletion = wp_delete_nav_menu( $nav_menu_selected_id );
</span><span class="cx"> } else {
</span><del>- // Reset the selected menu
</del><ins>+ // Reset the selected menu.
</ins><span class="cx"> $nav_menu_selected_id = 0;
</span><span class="cx"> unset( $_REQUEST['menu'] );
</span><span class="cx"> }
</span><span class="lines">@@ -266,22 +273,22 @@
</span><span class="cx"> case 'update':
</span><span class="cx"> check_admin_referer( 'update-nav_menu', 'update-nav-menu-nonce' );
</span><span class="cx">
</span><del>- // Remove menu locations that have been unchecked
</del><ins>+ // Remove menu locations that have been unchecked.
</ins><span class="cx"> foreach ( $locations as $location => $description ) {
</span><span class="cx"> if ( ( empty( $_POST['menu-locations'] ) || empty( $_POST['menu-locations'][ $location ] ) ) && isset( $menu_locations[ $location ] ) && $menu_locations[ $location ] == $nav_menu_selected_id )
</span><span class="cx"> unset( $menu_locations[ $location ] );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Merge new and existing menu locations if any new ones are set
</del><ins>+ // Merge new and existing menu locations if any new ones are set.
</ins><span class="cx"> if ( isset( $_POST['menu-locations'] ) ) {
</span><span class="cx"> $new_menu_locations = array_map( 'absint', $_POST['menu-locations'] );
</span><span class="cx"> $menu_locations = array_merge( $menu_locations, $new_menu_locations );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Set menu locations
</del><ins>+ // Set menu locations.
</ins><span class="cx"> set_theme_mod( 'nav_menu_locations', $menu_locations );
</span><span class="cx">
</span><del>- // Add Menu
</del><ins>+ // Add Menu.
</ins><span class="cx"> if ( 0 == $nav_menu_selected_id ) {
</span><span class="cx"> $new_menu_title = trim( esc_html( $_POST['menu-name'] ) );
</span><span class="cx">
</span><span class="lines">@@ -314,6 +321,7 @@
</span><span class="cx"> $menu_locations[ $_REQUEST['use-location'] ] = $nav_menu_selected_id;
</span><span class="cx"> set_theme_mod( 'nav_menu_locations', $menu_locations );
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> // $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( '<strong>%s</strong> has been created.' ), $nav_menu_selected_title ) . '</p></div>';
</span><span class="cx"> wp_redirect( admin_url( 'nav-menus.php?menu=' . $_nav_menu_selected_id ) );
</span><span class="cx"> exit();
</span><span class="lines">@@ -322,7 +330,7 @@
</span><span class="cx"> $messages[] = '<div id="message" class="error"><p>' . __( 'Please enter a valid menu name.' ) . '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Update existing menu
</del><ins>+ // Update existing menu.
</ins><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> $_menu_object = wp_get_nav_menu_object( $nav_menu_selected_id );
</span><span class="lines">@@ -344,7 +352,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Update menu items
</del><ins>+ // Update menu items.
</ins><span class="cx"> if ( ! is_wp_error( $_menu_object ) ) {
</span><span class="cx"> $messages = array_merge( $messages, wp_nav_menu_update_menu_items( $nav_menu_selected_id, $nav_menu_selected_title ) );
</span><span class="cx"> }
</span><span class="lines">@@ -371,7 +379,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Get all nav menus
</del><ins>+// Get all nav menus.
</ins><span class="cx"> $nav_menus = wp_get_nav_menus( array('orderby' => 'name') );
</span><span class="cx"> $menu_count = count( $nav_menus );
</span><span class="cx">
</span><span class="lines">@@ -380,7 +388,10 @@
</span><span class="cx">
</span><span class="cx"> $locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
</span><span class="cx">
</span><del>-// If we have one theme location, and zero menus, we take them right into editing their first menu
</del><ins>+/*
+ * If we have one theme location, and zero menus, we take them right
+ * into editing their first menu.
+ */
</ins><span class="cx"> $page_count = wp_count_posts( 'page' );
</span><span class="cx"> $one_theme_location_no_menus = ( 1 == count( get_registered_nav_menus() ) && ! $add_new_screen && empty( $nav_menus ) && ! empty( $page_count->publish ) ) ? true : false;
</span><span class="cx">
</span><span class="lines">@@ -404,32 +415,35 @@
</span><span class="cx"> );
</span><span class="cx"> wp_localize_script( 'nav-menu', 'menus', $nav_menus_l10n );
</span><span class="cx">
</span><del>-// Redirect to add screen if there are no menus and this users has either zero, or more than 1 theme locations
</del><ins>+/*
+ * Redirect to add screen if there are no menus and this users has either zero,
+ * or more than 1 theme locations.
+ */
</ins><span class="cx"> if ( 0 == $menu_count && ! $add_new_screen && ! $one_theme_location_no_menus )
</span><span class="cx"> wp_redirect( admin_url( 'nav-menus.php?action=edit&menu=0' ) );
</span><span class="cx">
</span><del>-// Get recently edited nav menu
</del><ins>+// Get recently edited nav menu.
</ins><span class="cx"> $recently_edited = absint( get_user_option( 'nav_menu_recently_edited' ) );
</span><span class="cx"> if ( empty( $recently_edited ) && is_nav_menu( $nav_menu_selected_id ) )
</span><span class="cx"> $recently_edited = $nav_menu_selected_id;
</span><span class="cx">
</span><del>-// Use $recently_edited if none are selected
</del><ins>+// Use $recently_edited if none are selected.
</ins><span class="cx"> if ( empty( $nav_menu_selected_id ) && ! isset( $_GET['menu'] ) && is_nav_menu( $recently_edited ) )
</span><span class="cx"> $nav_menu_selected_id = $recently_edited;
</span><span class="cx">
</span><del>-// On deletion of menu, if another menu exists, show it
</del><ins>+// On deletion of menu, if another menu exists, show it.
</ins><span class="cx"> if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] )
</span><span class="cx"> $nav_menu_selected_id = $nav_menus[0]->term_id;
</span><span class="cx">
</span><del>-// Set $nav_menu_selected_id to 0 if no menus
</del><ins>+// Set $nav_menu_selected_id to 0 if no menus.
</ins><span class="cx"> if ( $one_theme_location_no_menus ) {
</span><span class="cx"> $nav_menu_selected_id = 0;
</span><span class="cx"> } elseif ( empty( $nav_menu_selected_id ) && ! empty( $nav_menus ) && ! $add_new_screen ) {
</span><del>- // if we have no selection yet, and we have menus, set to the first one in the list
</del><ins>+ // if we have no selection yet, and we have menus, set to the first one in the list.
</ins><span class="cx"> $nav_menu_selected_id = $nav_menus[0]->term_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Update the user's setting
</del><ins>+// Update the user's setting.
</ins><span class="cx"> if ( $nav_menu_selected_id != $recently_edited && is_nav_menu( $nav_menu_selected_id ) )
</span><span class="cx"> update_user_meta( $current_user->ID, 'nav_menu_recently_edited', $nav_menu_selected_id );
</span><span class="cx">
</span><span class="lines">@@ -439,23 +453,25 @@
</span><span class="cx"> $nav_menu_selected_title = ! is_wp_error( $_menu_object ) ? $_menu_object->name : '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Generate truncated menu names
</del><ins>+// Generate truncated menu names.
</ins><span class="cx"> foreach( (array) $nav_menus as $key => $_nav_menu ) {
</span><span class="cx"> $nav_menus[$key]->truncated_name = wp_html_excerpt( $_nav_menu->name, 40, '…' );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Retrieve menu locations
</del><ins>+// Retrieve menu locations.
</ins><span class="cx"> if ( current_theme_supports( 'menus' ) ) {
</span><span class="cx"> $locations = get_registered_nav_menus();
</span><span class="cx"> $menu_locations = get_nav_menu_locations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// Ensure the user will be able to scroll horizontally
-// by adding a class for the max menu depth.
</del><ins>+/*
+ * Ensure the user will be able to scroll horizontally
+ * by adding a class for the max menu depth.
+ */
</ins><span class="cx"> global $_wp_nav_menu_max_depth;
</span><span class="cx"> $_wp_nav_menu_max_depth = 0;
</span><span class="cx">
</span><del>-// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth
</del><ins>+// Calling wp_get_nav_menu_to_edit generates $_wp_nav_menu_max_depth.
</ins><span class="cx"> if ( is_nav_menu( $nav_menu_selected_id ) ) {
</span><span class="cx"> $menu_items = wp_get_nav_menu_items( $nav_menu_selected_id, array( 'post_status' => 'any' ) );
</span><span class="cx"> $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
</span><span class="lines">@@ -510,7 +526,7 @@
</span><span class="cx"> 'title' => __( 'Editing Menus' ),
</span><span class="cx"> 'content' => $editing_menus
</span><span class="cx"> ) );
</span><del>-else : // Locations Tab
</del><ins>+else : // Locations Tab.
</ins><span class="cx"> $locations_overview = '<p>' . __( 'This screen is used for globally assigning menus to locations defined by your theme.' ) . '</p>';
</span><span class="cx"> $locations_overview .= '<ul><li>' . __( 'To assign menus to one or more theme locations, <strong>select a menu from each location’s drop down.</strong> When you’re finished, <strong>click Save Changes</strong>' ) . '</li>';
</span><span class="cx"> $locations_overview .= '<li>' . __( 'To edit a menu currently assigned to a theme location, <strong>click the adjacent ’Edit’ link</strong>' ) . '</li>';
</span><span class="lines">@@ -529,7 +545,7 @@
</span><span class="cx"> '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span><del>-// Get the admin header
</del><ins>+// Get the admin header.
</ins><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="lines">@@ -644,7 +660,7 @@
</span><span class="cx"> */
</span><span class="cx"> $assigned_locations = array_slice( $locations_assigned_to_this_menu, 0, absint( apply_filters( 'wp_nav_locations_listed_per_menu', 3 ) ) );
</span><span class="cx">
</span><del>- // Adds ellipses following the number of locations defined in $assigned_locations
</del><ins>+ // Adds ellipses following the number of locations defined in $assigned_locations.
</ins><span class="cx"> if ( ! empty( $assigned_locations ) ) {
</span><span class="cx"> printf( ' (%1$s%2$s)',
</span><span class="cx"> implode( ', ', $assigned_locations ),
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-info.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-info.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/network/site-info.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -59,10 +59,10 @@
</span><span class="cx"> update_option( 'home', $blog_address );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // rewrite rules can't be flushed during switch to blog
</del><ins>+ // Rewrite rules can't be flushed during switch to blog.
</ins><span class="cx"> delete_option( 'rewrite_rules' );
</span><span class="cx">
</span><del>- // update blogs table
</del><ins>+ // Update blogs table.
</ins><span class="cx"> $blog_data = wp_unslash( $_POST['blog'] );
</span><span class="cx"> $existing_details = get_blog_details( $id, false );
</span><span class="cx"> $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/network.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx"> check_admin_referer( 'install-network-1' );
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
</span><del>- // create network tables
</del><ins>+ // Create network tables.
</ins><span class="cx"> install_network();
</span><span class="cx"> $base = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
</span><span class="cx"> $subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/options.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> if ( is_serialized( $option->option_value ) ) {
</span><span class="cx"> if ( is_serialized_string( $option->option_value ) ) {
</span><del>- // this is a serialized string, so we should display it
</del><ins>+ // This is a serialized string, so we should display it.
</ins><span class="cx"> $value = maybe_unserialize( $option->option_value );
</span><span class="cx"> $options_to_update[] = $option->option_name;
</span><span class="cx"> $class = 'all-options';
</span></span></pre></div>
<a id="trunksrcwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/press-this.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/press-this.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/press-this.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> $upload = false;
</span><span class="cx"> if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
</span><span class="cx"> foreach( (array) $_POST['photo_src'] as $key => $image) {
</span><del>- // see if files exist in content - we don't want to upload non-used selected files.
</del><ins>+ // See if files exist in content - we don't want to upload non-used selected files.
</ins><span class="cx"> if ( strpos($_POST['content'], htmlspecialchars($image)) !== false ) {
</span><span class="cx"> $desc = isset($_POST['photo_description'][$key]) ? $_POST['photo_description'][$key] : '';
</span><span class="cx"> $upload = media_sideload_image($image, $post_ID, $desc);
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- // set the post_content and status
</del><ins>+ // Set the post_content and status.
</ins><span class="cx"> $post['post_content'] = $content;
</span><span class="cx"> if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
</span><span class="cx"> $post['post_status'] = 'publish';
</span><span class="lines">@@ -60,12 +60,12 @@
</span><span class="cx"> else
</span><span class="cx"> $post['post_status'] = 'draft';
</span><span class="cx">
</span><del>- // error handling for media_sideload
</del><ins>+ // Error handling for media_sideload.
</ins><span class="cx"> if ( is_wp_error($upload) ) {
</span><span class="cx"> wp_delete_post($post_ID);
</span><span class="cx"> wp_die($upload);
</span><span class="cx"> } else {
</span><del>- // Post formats
</del><ins>+ // Post formats.
</ins><span class="cx"> if ( isset( $_POST['post_format'] ) ) {
</span><span class="cx"> if ( current_theme_supports( 'post-formats', $_POST['post_format'] ) )
</span><span class="cx"> set_post_format( $post_ID, $_POST['post_format'] );
</span><span class="lines">@@ -181,9 +181,10 @@
</span><span class="cx"> return '';
</span><span class="cx"> $sources = array();
</span><span class="cx"> foreach ($matches[3] as $src) {
</span><del>- // if no http in url
</del><ins>+
+ // If no http in URL.
</ins><span class="cx"> if (strpos($src, 'http') === false)
</span><del>- // if it doesn't have a relative uri
</del><ins>+ // If it doesn't have a relative URI.
</ins><span class="cx"> if ( strpos($src, '../') === false && strpos($src, './') === false && strpos($src, '/') === 0)
</span><span class="cx"> $src = 'http://'.str_replace('//','/', $host['host'].'/'.$src);
</span><span class="cx"> else
</span><span class="lines">@@ -197,7 +198,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'photo_js': ?>
</span><del>- // gather images and load some default JS
</del><ins>+ // Gather images and load some default JS.
</ins><span class="cx"> var last = null
</span><span class="cx"> var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
</span><span class="cx"> if(photostorage == false) {
</span><span class="lines">@@ -438,12 +439,14 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> jQuery(document).ready(function($) {
</span><del>- //resize screen
</del><ins>+ // Resize screen.
</ins><span class="cx"> window.resizeTo(760,580);
</span><del>- // set button actions
</del><ins>+
+ // Set button actions.
</ins><span class="cx"> jQuery('#photo_button').click(function() { show('photo'); return false; });
</span><span class="cx"> jQuery('#video_button').click(function() { show('video'); return false; });
</span><del>- // auto select
</del><ins>+
+ // Auto select.
</ins><span class="cx"> <?php if ( preg_match("/youtube\.com\/watch/i", $url) ) { ?>
</span><span class="cx"> show('video');
</span><span class="cx"> <?php } elseif ( preg_match("/vimeo\.com\/[0-9]+/i", $url) ) { ?>
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/setup-config.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/setup-config.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/setup-config.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -300,8 +300,10 @@
</span><span class="cx"> </script>
</span><span class="cx"> <?php
</span><span class="cx"> else :
</span><del>- // If this file doesn't exist, then we are using the wp-config-sample.php
- // file one level up, which is for the develop repo.
</del><ins>+ /*
+ * If this file doesn't exist, then we are using the wp-config-sample.php
+ * file one level up, which is for the develop repo.
+ */
</ins><span class="cx"> if ( file_exists( ABSPATH . 'wp-config-sample.php' ) )
</span><span class="cx"> $path_to_wp_config = ABSPATH . 'wp-config.php';
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-editor.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-editor.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/theme-editor.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> $newcontent = wp_unslash( $_POST['newcontent'] );
</span><span class="cx"> $location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
</span><span class="cx"> if ( is_writeable( $file ) ) {
</span><del>- //is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
</del><ins>+ // is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
</ins><span class="cx"> $f = fopen( $file, 'w+' );
</span><span class="cx"> if ( $f !== false ) {
</span><span class="cx"> fwrite( $f, $newcontent );
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/update-core.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/update-core.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/update-core.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -540,8 +540,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer('upgrade-core');
</span><span class="cx">
</span><del>- // do the (un)dismiss actions before headers,
- // so that they can redirect
</del><ins>+ // Do the (un)dismiss actions before headers, so that they can redirect.
</ins><span class="cx"> if ( isset( $_POST['dismiss'] ) )
</span><span class="cx"> do_dismiss_core_update();
</span><span class="cx"> elseif ( isset( $_POST['undismiss'] ) )
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/widgets.php (29205 => 29206)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/widgets.php 2014-07-17 09:11:46 UTC (rev 29205)
+++ trunk/src/wp-admin/widgets.php 2014-07-17 09:13:53 UTC (rev 29206)
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> $id_base = $_POST['id_base'];
</span><span class="cx"> $sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
</span><span class="cx">
</span><del>- // delete
</del><ins>+ // Delete.
</ins><span class="cx"> if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
</span><span class="cx">
</span><span class="cx"> if ( !in_array($widget_id, $sidebar, true) ) {
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">
</span><span class="cx"> $sidebars_widgets[$sidebar_id] = $sidebar;
</span><span class="cx">
</span><del>- // remove old position
</del><ins>+ // Remove old position.
</ins><span class="cx"> if ( !isset($_POST['delete_widget']) ) {
</span><span class="cx"> foreach ( $sidebars_widgets as $key => $sb ) {
</span><span class="cx"> if ( is_array($sb) )
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx">
</span><span class="cx"> $id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
</span><span class="cx">
</span><del>- // show the widget form
</del><ins>+ // Show the widget form.
</ins><span class="cx"> $width = ' style="width:' . max($control['width'], 350) . 'px"';
</span><span class="cx"> $key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>