<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15116] trunk: Cut 'em out, move 'em on, trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15116">15116</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-02 20:04:07 +0000 (Wed, 02 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cut 'em out, move 'em on, trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminjslinkdevjs">trunk/wp-admin/js/link.dev.js</a></li>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminjspostdevjs">trunk/wp-admin/js/post.dev.js</a></li>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsthemesphp">trunk/wp-admin/ms-themes.php</a></li>
<li><a href="#trunkwpadminmsupgradenetworkphp">trunk/wp-admin/ms-upgrade-network.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsprivacyphp">trunk/wp-admin/options-privacy.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpincludesfeedphp">trunk/wp-includes/feed.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/admin-ajax.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -1115,9 +1115,9 @@
</span><span class="cx"> 'args' => $item,
</span><span class="cx"> )
</span><span class="cx"> ));
</span><del>-
</del><ins>+
</ins><span class="cx"> $markup = ob_get_clean();
</span><del>-
</del><ins>+
</ins><span class="cx"> echo json_encode(array(
</span><span class="cx"> 'replace-id' => $type . '-' . $item->name,
</span><span class="cx"> 'markup' => $markup,
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/includes/nav-menu.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -694,7 +694,7 @@
</span><span class="cx"> <ul id="<?php echo $post_type_name; ?>checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
</span><span class="cx"> <?php
</span><span class="cx"> $args['walker'] = $walker;
</span><del>-
</del><ins>+
</ins><span class="cx"> // if we're dealing with pages, let's put a checkbox for the front page at the top of the list
</span><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="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx"> );
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/**
</del><ins>+/**
</ins><span class="cx"> * Deletes orphaned draft menu items
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span></span></pre></div>
<a id="trunkwpadminjslinkdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/link.dev.js (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/link.dev.js 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/js/link.dev.js 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> if ( 'pop' == getUserSetting('cats') )
</span><span class="cx"> $('a[href="#categories-pop"]').click();
</span><span class="cx">
</span><del>- $('#category-add-toggle').click( function() {
</del><ins>+ $('#category-add-toggle').click( function() {
</ins><span class="cx"> $(this).parents('div:first').toggleClass( 'wp-hidden-children' );
</span><span class="cx"> $('#category-tabs a[href="#categories-all"]').click();
</span><span class="cx"> $('#newcategory').focus();
</span></span></pre></div>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/js/nav-menu.dev.js 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -138,10 +138,10 @@
</span><span class="cx"> listItemDBIDMatch = re.exec( t.attr('name') ),
</span><span class="cx"> listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10);
</span><span class="cx"> if ( this.className && -1 != this.className.indexOf('add-to-top') )
</span><del>- processMethod = api.addMenuItemToTop;
</del><ins>+ processMethod = api.addMenuItemToTop;
</ins><span class="cx"> menuItems[listItemDBID] = t.closest('li').getItemData( 'add-menu-item', listItemDBID );
</span><span class="cx"> });
</span><del>-
</del><ins>+
</ins><span class="cx"> // Add the items
</span><span class="cx"> api.addItemToMenu(menuItems, processMethod, function(){
</span><span class="cx"> // Deselect the items and hide the ajax spinner
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> placeholder: 'sortable-placeholder',
</span><span class="cx"> start: function(e, ui) {
</span><span class="cx"> var height, width, parent, children, maxChildDepth, tempHolder;
</span><del>-
</del><ins>+
</ins><span class="cx"> // handle placement for rtl orientation
</span><span class="cx"> if ( api.isRTL )
</span><span class="cx"> ui.item[0].style.right = 'auto';
</span><span class="lines">@@ -622,7 +622,7 @@
</span><span class="cx"> $('#' + e.target.id.replace(/submit-/, '')).addSelectedToMenu( api.addMenuItemToBottom );
</span><span class="cx"> return false;
</span><span class="cx"> } else if ( target.hasClass('page-numbers') ) {
</span><del>- $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
</del><ins>+ $.post( ajaxurl, e.target.href.replace(/.*\?/, '').replace(/action=([^&]*)/, '') + '&action=menu-get-metabox',
</ins><span class="cx"> function( resp ) {
</span><span class="cx"> if ( -1 == resp.indexOf('replace-id') )
</span><span class="cx"> return;
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> });
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> fixedLeft = fixed.offset().left;
</span><span class="cx"> fixedRight = fixedLeft + fixedWidth;
</span><span class="cx"> active.makeTabVisible();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Prevent space from building up next to the last tab if there's more to show
</span><span class="cx"> if( tabs.last().isTabVisible() ) {
</span><span class="cx"> margin = fixed.width() - tabsWidth;
</span></span></pre></div>
<a id="trunkwpadminjspostdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post.dev.js (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post.dev.js 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/js/post.dev.js 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -315,7 +315,7 @@
</span><span class="cx">
</span><span class="cx"> $('#' + taxonomy + '-add-toggle').click( function() {
</span><span class="cx"> $('#' + taxonomy + '-adder').toggleClass( 'wp-hidden-children' );
</span><del>- $('a[href="#' + taxonomy + '-all"]', '#' + taxonomy + '-tabs').click();
</del><ins>+ $('a[href="#' + taxonomy + '-all"]', '#' + taxonomy + '-tabs').click();
</ins><span class="cx"> $('#new'+taxonomy).focus();
</span><span class="cx"> return false;
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-admin.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> $title = __( 'Network Admin' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('Until WordPress 3.0, running multiple sites required using WordPress MU instead of regular WordPress. In version 3.0, these applications have merged. If you are a former MU user, you should be aware of the following changes:') . '</p>' .
</span><span class="cx"> '<ul><li>' . __('Site Admin is now Super Admin (we highly encourage you to get yourself a cape!).') . '</li>' .
</span><span class="cx"> '<li>' . __('Blogs are now called Sites; Site is now called Network.') . '</li></ul>' .
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-options.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> $title = __( 'Network Options' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen sets and changes options for the network as a whole. The first site is the main site in the network and network options are pulled from that original site&#8217;s options.') . '</p>' .
</span><span class="cx"> '<p>' . __('Operational settings has fields for the network&#8217;s name, admin email, and whether global terms will be disabled (the default) or maintained across all sites on the network.') . '</p>' .
</span><span class="cx"> '<p>' . __('Dashboard Site is an option to give a site to users who do not have a site on the system. Their default role is subscribed but that default can be changed. The Admin Notice Feed can provide a notice on all dashboards of the latest post via RSS or Atom, or provide no such notice if left blank.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-sites.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><span class="cx"> if ( isset( $_GET['action'] ) && 'editblog' == $_GET['action'] ) {
</span><del>- add_contextual_help($current_screen,
</del><ins>+ add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('The network admin arrives at this screen to make choices for a given site by clicking on the Edit link on the Sites screen available to them in the Super Admin navigation menu.') . '</p>' .
</span><span class="cx"> '<p>' . __('This extensive list of options has five modules: Site Info, Site Options, allowing Site Themes for this given site, changing the Site User(s) roles and passwords for that site, Adding a new user, and Miscellaneous Site Actions (upload size limits).') . '</p>' .
</span><span class="cx"> '<p>' . __('Note that some fields in Site Options are grayed out and say Serialized Data. These are stored values in the database which you cannot change from here.') . '</p>' .
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx"> } else {
</span><del>- add_contextual_help($current_screen,
</del><ins>+ add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('Add New takes you farther down on this same page. You can search for a site by Name, ID number, or IP address. Screen Options allows you to choose how many sites to display on one page.') . '</p>' .
</span><span class="cx"> '<p>' . __('This is the main table of all sites on this network. Switch between list and excerpt views by using the icons above the right side of the table.') . '</p>' .
</span><span class="cx"> '<p>' . __('Hovering over each site reveals seven options (only three for the primary or originating site for the network):') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminmsthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-themes.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-themes.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-themes.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __( 'Network Themes' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen enables and disables the inclusion of themes available to choose in the Appearance menu for each site. It does not activate or deactivate which theme a site is currently using.') . '</p>' .
</span><span class="cx"> '<p>' . __('If the network admin disables a theme that is in use, it can still remain selected on that site. If another theme is chosen, the disabled theme will not appear in the site&#8217;s Appearance > Themes screen.') . '</p>' .
</span><span class="cx"> '<p>' . __('Themes can be enabled on a site by site basis by the network admin on the Edit Site screen you go to via the Edit hover link on the Sites screen.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminmsupgradenetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-network.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-network.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-upgrade-network.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> $title = __( 'Update Network' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('Only use this screen once you have updated to a new version of WordPress through Dashboard > Updates. Clicking the Update Network button will step through each site in the network, five at a time, and make sure any database upgrades are applied.') . '</p>' .
</span><span class="cx"> '<p>' . __('If a version update to core has not happened, clicking this button won&#8217;t affect anything.') . '</p>' .
</span><span class="cx"> '<p>' . __('If this process fails for any reason, users logging in to their sites will force the same update.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/ms-users.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx"> $title = __( 'Users' );
</span><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This table shows all users across the network and the sites to which they are assigned.') . '</p>' .
</span><span class="cx"> '<p>' . __('Hover over any user on the list to make the edit links appear. The Edit link on the left will take you to his or her Edit User profile page; the Edit link on the right by any site name goes to an Edit Site screen for that site.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can also go to the user&#8217;s profile page by clicking on the individual username.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/my-sites.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> $title = __( 'My Sites' );
</span><span class="cx"> $parent_file = 'index.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen shows an individual user all of their sites in this network, and also allows that user to set a primary site. He or she can use the links under each site to visit either the frontend or the dashboard for that site.') . '</p>' .
</span><span class="cx"> '<p>' . __('Up until WordPress version 3.0, what is now called a Multi-site Network had to be installed separately as WordPress MU (multi-user).') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/nav-menus.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> $help = '<p>' . __('This feature is new in version 3.0; to use a custom menu in place of your theme&#8217;s default menus, support for this feature must be registered in the theme&#8217;s functions.php file. If your theme does not support the custom menus feature yet (the new default theme, Twenty Ten, does), you can learn about adding support yourself by following the below link.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('You can create custom menus for your site. These menus may contain links to pages, categories, custom links or other content types (use the Screen Options tab to decide which ones to show on the screen). You can specify a different navigation label for a menu item as well as other attributes. You can create multiple menus. If your theme includes more than one menu, you can choose which custom menu to associate with each. You can also use custom menus in conjunction with the Custom Menus widget.') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('To create a new custom menu, click on the + tab, give the menu a name, and click Create Menu. Next, add menu items from the appropriate boxes. You&#8217;ll be able to edit the information for each menu item, and can drag and drop to put them in order. You can also drag a menu item a little to the right to make it a submenu, to create menus with hierarchy. You&#8217;ll see when the position of the drop target shifts over to create the nested placement. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>';
</span><del>-$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</del><ins>+$help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</ins><span class="cx"> $help .= '<p>' . __('<a href="http://codex.wordpress.org/Appearance_Menus_SubPanel">Menus Documentation</a>') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</span><span class="cx">
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> </div><!-- END #nav-menu-header -->
</span><span class="cx"> <div id="post-body">
</span><span class="cx"> <div id="post-body-content">
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> if ( is_nav_menu( $nav_menu_selected_id ) ) :
</span><span class="cx"> $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id );
</span><span class="cx"> if ( ! is_wp_error( $edit_markup ) ) :
</span><span class="lines">@@ -577,7 +577,7 @@
</span><span class="cx"> echo '<p>' . __('After you have added your items, drag and drop to put them in the order you want. You can also click each item to reveal additional configuration options.') . '</p>';
</span><span class="cx"> echo '<p>' . __('When you have finished building your custom menu, make sure you click the Save Menu button.') . '</p>';
</span><span class="cx"> echo '</div>';
</span><del>- endif;
</del><ins>+ endif;
</ins><span class="cx"> ?>
</span><span class="cx"> </div><!-- /#post-body-content -->
</span><span class="cx"> </div><!-- /#post-body -->
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/network.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> $title = __( 'Create a Network of WordPress Sites' );
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen allows you to configure a network as having subdomains (site1.example.com) or subdirectories (example.com/site1). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
</span><span class="cx"> '<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
</span><span class="cx"> '<p>' . __('The next screen for Network will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-discussion.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __('Discussion Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen provides many options for controlling the management and display of comments and links to your posts/pages. So many, in fact, they won&#8217;t all fit here! :) Use the documentation link below to get information on what each discussion setting does.') . '</p>' .
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-general.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> }
</span><span class="cx"> add_filter('admin_head', 'add_js');
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
</span><span class="cx"> '<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>' .
</span><span class="cx"> '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-media.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __('Media Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>' .
</span><span class="cx"> '<p>' . __('The Embed option allows you embed a video, image, or other media content into your content automatically by typing the URL (of the web page where the file lives) on its own line when you create your content.') . '</p>' .
</span><span class="cx"> '<p>' . __('Uploading Options gives you folder and path choices for storing your files in your installation&#8217;s directory.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-permalink.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __('Permalink Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen provides some common options for your default permalinks URL structure.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %, will also appear in the custom structure field and your path can be further modified there.') . '</p>' .
</span><span class="cx"> '<p>' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category% or %tag%.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-privacy.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-privacy.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-privacy.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __('Privacy Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the second option here. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
</span><span class="cx"> '<p>' . __('When this setting is in effect a reminder is shown in the header of these administration screens that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>' .
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-reading.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __( 'Reading Settings' );
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('This screen contains the settings that affect the display of your content.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can choose what&#8217;s displayed on the front page of your site. It can be posts in reverse chronological order (classic blog), or a fixed/static page. To set a static home page, you first need to create two <a href="post-new.php?post_type=page">Pages</a>. One will become the front page, and the other will be where your posts are displayed.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can also control the display of your content in RSS feeds, including the maximum numbers of posts to display, whether to show full text or a summary, and the character set encoding.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/options-writing.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $title = __('Writing Settings');
</span><span class="cx"> $parent_file = 'options-general.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
</del><ins>+add_contextual_help($current_screen,
</ins><span class="cx"> '<p>' . __('You can submit content in several different ways; this screen holds the settings for all of them. The top section controls the editor within these administration screens, while the rest control external publishing methods. For more information on any of these methods, use the documentation links below.') . '</p>' .
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/plugins.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>' .
</span><span class="cx"> '<p>' . sprintf(__('You can find additional plugins for your site by using the <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="%2$s">WordPress Plugin Directory</a> directly and installing new plugins manually. To manually install a plugin you generally just need to upload the plugin file into your <code>/wp-content/plugins</code> directory. Once a plugin has been installed, you can activate it here.'), 'plugin-install.php', 'http://wordpress.org/extend/plugins/') . '</p>' .
</span><span class="cx"> '<p>' . __('Most of the time, plugins play nicely with the core of WordPress and with other plugins. Sometimes, though, a plugin&#8217;s code will get in the way of another plugin, causing compatibility issues. If your site starts doing strange things, this may be the problem. Try deactivating all your plugins and re-activating them in various combinations until you isolate which one(s) caused the issue.') . '</p>' .
</span><del>- '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .
</del><ins>+ '<p>' . sprintf( __('If something goes wrong with a plugin and you can&#8217;t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Managing_Plugins#Plugin_Management">Documentation on Managing Plugins</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/themes.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> $help .= '<p>' . __('You can see your active theme at the top of the screen. Below are the other themes you have installed that are not currently in use. You can see what your site would look like with one of these themes by clicking the Preview link. To change themes, click the Activate link.') . '</p>';
</span><span class="cx"> if ( current_user_can('install_themes') )
</span><span class="cx"> $help .= '<p>' . sprintf(__('If you would like to see more themes to choose from, click on the &#8220;Install Themes&#8221; tab and you will be able to browse or search for additional themes from the <a href="%s">WordPress.org theme repository</a>. Themes in the WordPress.org theme repository are designed and developed by third parties, and are licensed under the GNU General Public License, version 2, just like WordPress. Oh, and they&#8217;re free!'), 'http://wordpress.org/extend/themes/') . '</p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> $help .= '<p><strong>' . __('For more information:') . '</strong></p>';
</span><span class="cx"> $help .= '<p>' . __('<a href="http://codex.wordpress.org/Using_Themes">Documentation on Using Themes</a>') . '</p>';
</span><span class="cx"> $help .= '<p>' . __('<a href="http://wordpress.org/support/">Support Forums</a>') . '</p>';
</span></span></pre></div>
<a id="trunkwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-edit.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/user-edit.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -36,13 +36,13 @@
</span><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
</span><del>- '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' .
</del><ins>+ '<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things.') . '</p>' .
</ins><span class="cx"> '<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
</span><span class="cx"> '<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
</span><del>- '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>' .
- '<p><strong>' . __('For more information:') . '</strong></p>' .
</del><ins>+ '<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>' .
+ '<p><strong>' . __('For more information:') . '</strong></p>' .
</ins><span class="cx"> '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Your_Profile_SubPanel">Documentation on User Profiles</a>') . '</p>' .
</span><del>- '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins>+ '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/user-new.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -108,20 +108,20 @@
</span><span class="cx"> $title = __('Add New User');
</span><span class="cx"> $parent_file = 'users.php';
</span><span class="cx">
</span><del>-add_contextual_help($current_screen,
- '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
- '<ul>' .
</del><ins>+add_contextual_help($current_screen,
+ '<p>' . __('To add a new user to your site, fill in the form on this screen. If you&#8217;re not sure which role to assign, you can use the link below to review the different roles and their capabilities. Here is a basic overview of roles:') . '</p>' .
+ '<ul>' .
</ins><span class="cx"> '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
</span><del>- '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
</del><ins>+ '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
</ins><span class="cx"> '<li>' . __('Authors can publish and manage their own posts.') . '</li>' .
</span><del>- '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
- '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
</del><ins>+ '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
+ '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc.') . '</li>' .
</ins><span class="cx"> '</ul>' .
</span><span class="cx"> '<p>' . __('You must assign a password to the new user, but don&#8217;t worry; when they log in for the first time they will be prompted to change it. The username, however, cannot be changed.') . '</p>' .
</span><span class="cx"> '<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you do not the password to be included in the welcome email.') . '</p>' .
</span><span class="cx"> '<p>' . __('Remember to click the Add User button at the bottom of this screen when you are finished.') . '</p>' .
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><del>- '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Add_New_SubPanel">Documentation on Adding New Users</a>') . '</p>' .
</del><ins>+ '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Users_Add_New_SubPanel">Documentation on Adding New Users</a>') . '</p>' .
</ins><span class="cx"> '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-admin/users.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><span class="cx"> add_contextual_help($current_screen,
</span><span class="cx"> '<p>' . __('This screen lists all the existing users for your site. Each user has one of five defined roles as set by the site admin: Site Administrator, Editor, Author, Contributor, or Subscriber. Users with roles other than Administrator will see fewer options when they are logged in, based on their role.') . '</p>' .
</span><del>- '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' .
- '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' .
</del><ins>+ '<p>' . __('You can customize the display of information on this screen as you can on other screens, by using the Screen Options tab and the on-screen filters.') . '</p>' .
+ '<p>' . __('To add a new user for your site, click the Add New button at the top of the screen or Add New in the Users menu section.') . '</p>' .
</ins><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a target="_blank" href=http://codex.wordpress.org/Users_Authors_and_Users_SubPanel">Documentation on Authors and Users</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a target="_blank" href="http://codex.wordpress.org/Roles_and_Capabilities">Roles and Capabilities Descriptions</a>') . '</p>' .
</span><del>- '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</del><ins>+ '<p>' . __('<a target="_blank" href="http://wordpress.org/support/">Support Forums</a>') . '</p>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $update = $doaction = '';
</span></span></pre></div>
<a id="trunkwpincludesfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/feed.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/feed.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/feed.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Outputs the link to the comments for the current post in an xml safe way
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @return none
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/functions.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -2306,7 +2306,7 @@
</span><span class="cx"> @fwrite( $ifp, $bits );
</span><span class="cx"> fclose( $ifp );
</span><span class="cx"> clearstatcache();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Set correct file permissions
</span><span class="cx"> $stat = @ stat( dirname( $new_file ) );
</span><span class="cx"> $perms = $stat['mode'] & 0007777;
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/l10n.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> $locale = get_locale();
</span><span class="cx">
</span><span class="cx"> load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( is_multisite() || ( defined( 'WP_NETWORK_ADMIN_PAGE' ) && WP_NETWORK_ADMIN_PAGE ) ) {
</span><span class="cx"> load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/nav-menu-template.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -314,9 +314,9 @@
</span><span class="cx"> $active_object = $menu_item->object;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // back-compat with wp_page_menu: add "current_page_parent" to static home page link for any non-page query
</span><del>- if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
</del><ins>+ if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id )
</ins><span class="cx"> $classes[] = 'current_page_parent';
</span><span class="cx">
</span><span class="cx"> $menu_items[$key]->classes = array_unique( $classes );
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> $classes[] = 'current-menu-parent';
</span><span class="cx"> if ( in_array( $parent_item->object_id, $active_parent_object_ids ) )
</span><span class="cx"> $classes[] = 'current-' . $active_object . '-parent';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
</span><span class="cx"> // Back compat classes for pages to match wp_page_menu()
</span><span class="cx"> if ( in_array('current-menu-parent', $classes) )
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> if ( in_array('current-menu-ancestor', $classes) )
</span><span class="cx"> $classes[] = 'current_page_ancestor';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $menu_items[$key]->classes = array_unique( $classes );
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/nav-menu.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $args = wp_parse_args( $menu_item_data, $defaults );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 0 == $menu_id ) {
</span><span class="cx"> $args['menu-item-position'] = 1;
</span><span class="cx"> } elseif ( 0 == (int) $args['menu-item-position'] ) {
</span><span class="lines">@@ -367,13 +367,13 @@
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_object_id', (int) $args['menu-item-object-id'] );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key($args['menu-item-object']) );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key($args['menu-item-target']) );
</span><del>-
</del><ins>+
</ins><span class="cx"> $args['menu-item-classes'] = array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-classes'] ) );
</span><span class="cx"> $args['menu-item-xfn'] = implode( ' ', array_map( 'sanitize_html_class', explode( ' ', $args['menu-item-xfn'] ) ) );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_classes', $args['menu-item-classes'] );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_xfn', $args['menu-item-xfn'] );
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_url', esc_url_raw($args['menu-item-url']) );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( 0 == $menu_id )
</span><span class="cx"> update_post_meta( $menu_item_db_id, '_menu_item_orphaned', time() );
</span><span class="cx"> else
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/post-template.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> * The guid will appear to be a link, but should not be used as an link to the
</span><span class="cx"> * post. The reason you should not use it as a link, is because of moving the
</span><span class="cx"> * blog across domains.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * Url is escaped to make it xml safe
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15115 => 15116)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-06-02 19:56:19 UTC (rev 15115)
+++ trunk/wp-includes/taxonomy.php 2010-06-02 20:04:07 UTC (rev 15116)
</span><span class="lines">@@ -2395,7 +2395,7 @@
</span><span class="cx"> // Get the object and term ids and stick them in a lookup table
</span><span class="cx"> $tax_obj = get_taxonomy($taxonomy);
</span><span class="cx"> $object_types = esc_sql($tax_obj->object_type);
</span><del>- $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
</del><ins>+ $results = $wpdb->get_results("SELECT object_id, term_taxonomy_id FROM $wpdb->term_relationships INNER JOIN $wpdb->posts ON object_id = ID WHERE term_taxonomy_id IN (" . implode(',', array_keys($term_ids)) . ") AND post_type IN ('" . implode("', '", $object_types) . "') AND post_status = 'publish'");
</ins><span class="cx"> foreach ( $results as $row ) {
</span><span class="cx"> $id = $term_ids[$row->term_taxonomy_id];
</span><span class="cx"> $term_items[$id][$row->object_id] = isset($term_items[$id][$row->object_id]) ? ++$term_items[$id][$row->object_id] : 1;
</span></span></pre>
</div>
</div>
</body>
</html>