<!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>[19528] trunk: Pinking shears</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, #logmsg > ol { margin-left: 0; 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/19528">19528</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-01 04:51:35 +0000 (Thu, 01 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pinking shears</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminaboutphp">trunk/wp-admin/about.php</a></li>
<li><a href="#trunkwpadmincssinstalldevcss">trunk/wp-admin/css/install.dev.css</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmedialisttablephp">trunk/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjseditordevjs">trunk/wp-admin/js/editor.dev.js</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminmenuheaderphp">trunk/wp-admin/menu-header.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.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="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminaboutphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/about.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/about.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/about.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="changelog">
</span><span class="cx"> <h3><?php _e( 'Easier Uploading' ); ?></h3>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="feature-section images-stagger-right">
</span><span class="cx"> <div class="feature-images">
</span><span class="cx"> <img src="images/screenshots/media-icon.png" width="200" class="angled-right" />
</span><span class="lines">@@ -56,17 +56,17 @@
</span><span class="cx">
</span><span class="cx"> <div class="changelog">
</span><span class="cx"> <h3><?php _e( 'Dashboard Design' ); ?></h3>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="feature-section text-features">
</span><span class="cx"> <h4><?php _e( 'Flyout Menus' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'Speed up navigating the dashboard and reduce repetitive clicking with our new flyout submenus. As you hover over each main menu item in your dashboard navigation, the submenus will magically appear, providing single-click access to any dashboard screen.' ); ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div>
</span><span class="cx"> <h4><?php _e( 'Header + Admin Bar = Toolbar' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'To save space and increase efficiency, we&#8217;ve combined the admin bar and the old Dashboard header into one persistent toolbar. Hovering over the toolbar items will reveal submenus when available for quick access. ' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="feature-section screenshot-features">
</span><span class="cx"> <div class="angled-left">
</span><span class="cx"> <img src="images/screenshots/admin-flyouts.png" />
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx"> <h4><?php _e( 'Post-update Changelog' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'This screen! From now on when you update WordPress, you&#8217;ll be brought to this screen &mdash; also accessible any time from the W logo in the corner of the toolbar &mdash; to get an overview of what&#8217;s changed.' ); ?></p>
</span><span class="cx">
</span><del>- <h4><?php _e( 'Dashboard Welcome' ); ?></h4>
</del><ins>+ <h4><?php _e( 'Dashboard Welcome' ); ?></h4>
</ins><span class="cx"> <p><?php _e( 'The dashboard home screen will have a Welcome area that displays when a new WordPress installation is accessed for the first time, prompting the site owner to complete various setup tasks. Once dismissed, this welcome can be accessed via the dashboard home screen options tab.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="changelog">
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> <p><?php _e( 'Changing themes often requires widget re-configuration based on the number and position of sidebars. Now if you change back to a previous theme, the widgets will automatically go back to how you had them arranged in that theme. <em>Note: if you&#8217;ve added new widgets since the switch, you&#8217;ll need to rescue them from the Inactive Widgets area.</em>' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="changelog">
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> <p><?php _e( 'The new editor API automatically pulls in all the JS and CSS goodness for the editor. It even supports multiple editors on the same page.' ); ?></p>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="return-to-dashboard">
</span></span></pre></div>
<a id="trunkwpadmincssinstalldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/install.dev.css (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/install.dev.css 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/css/install.dev.css 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> font-family: sans-serif;
</span><span class="cx"> margin: 2em auto;
</span><span class="cx"> padding: 1em 2em;
</span><del>- -webkit-border-radius: 3px;
</del><ins>+ -webkit-border-radius: 3px;
</ins><span class="cx"> border-radius: 3px;
</span><span class="cx"> border: 1px solid #dfdfdf;
</span><span class="cx"> max-width: 700px;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/css/wp-admin.dev.css 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -4831,7 +4831,7 @@
</span><span class="cx"> margin: 25px 40px 0 20px;
</span><span class="cx"> min-width: 770px;
</span><span class="cx"> max-width: 1050px; /* readability */
</span><del>-
</del><ins>+
</ins><span class="cx"> font-size: 15px;
</span><span class="cx"> }
</span><span class="cx"> .about-wrap div.updated,
</span><span class="lines">@@ -4959,7 +4959,7 @@
</span><span class="cx">
</span><span class="cx"> .about-wrap .feature-section.text-features {
</span><span class="cx"> width: 31%;
</span><del>-
</del><ins>+
</ins><span class="cx"> float: left;
</span><span class="cx"> overflow: visible;
</span><span class="cx"> }
</span><span class="lines">@@ -4969,7 +4969,7 @@
</span><span class="cx"> .about-wrap .feature-section.screenshot-features {
</span><span class="cx"> width: 67%;
</span><span class="cx"> margin-top: 1.33em;
</span><del>-
</del><ins>+
</ins><span class="cx"> float: right;
</span><span class="cx"> clear: none;
</span><span class="cx"> overflow: visible;
</span><span class="lines">@@ -5009,7 +5009,7 @@
</span><span class="cx"> .about-wrap .feature-section.three-col img {
</span><span class="cx"> margin: 0.5em 0 0.5em 5px;
</span><span class="cx"> max-width: 100%;
</span><del>-
</del><ins>+
</ins><span class="cx"> float: none;
</span><span class="cx"> }
</span><span class="cx"> html.ie8 .about-wrap .feature-section.three-col img {
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/edit-comments.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -114,13 +114,13 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __( 'You can manage comments made on your site similar to the way you manage posts and other content. This screen is customizable in the same ways as other management screens, and you can act on comments using the on-hover action links or the Bulk Actions.' ) . '</p>'
</span><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'moderating-comments',
</span><span class="cx"> 'title' => __('Moderating Comments'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __( 'A yellow row means the comment is waiting for you to moderate it.' ) . '</li>' .
</span><span class="cx"> '<li>' . __( 'In the <strong>Author</strong> column, in addition to the author&#8217;s name, email address, and blog URL, the commenter&#8217;s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</li>' .
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx"> '<li>' . __( 'In the <strong>In Response To</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows how many comments that post has received. If the bubble is gray, you have moderated all comments for that post. If it is blue, there are pending comments. Clicking the bubble will filter the comments screen to show only comments on that post.' ) . '</li>' .
</span><span class="cx"> '<li>' . __( 'Many people take advantage of keyboard shortcuts to moderate their comments more quickly. Use the link to the side to learn more.' ) . '</li>' .
</span><span class="cx"> '</ul>'
</span><del>-) );
</del><ins>+) );
</ins><span class="cx">
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/edit-tags.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> $help .= '<li>' . __( '<strong>Description</strong> - The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
</span><span class="cx"> '</ul>' .
</span><span class="cx"> '<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'adding-terms',
</span><span class="cx"> 'title' => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/edit.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -152,13 +152,13 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('This screen provides access to all of your posts. You can customize the display of this screen to suit your workflow.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'screen-content',
</span><span class="cx"> 'title' => __('Screen Content'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('You can customize the display of this screen&#8217;s contents in a number of ways:') . '</p>' .
</span><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('You can hide/display columns based on your needs and decide how many posts to list per screen using the Screen Options tab.') . '</li>' .
</span><span class="lines">@@ -170,19 +170,19 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'action-links',
</span><span class="cx"> 'title' => __('Available Actions'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('Hovering over a row in the posts list will display action links that allow you to manage your post. You can perform the following actions:') . '</p>' .
</span><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('<strong>Edit</strong> takes you to the editing screen for that post. You can also reach that screen by clicking on the post title.') . '</li>' .
</span><span class="cx"> '<li>' . __('<strong>Quick Edit</strong> provides inline access to the metadata of your post, allowing you to update post details without leaving this screen.') . '</li>' .
</span><span class="cx"> '<li>' . __('<strong>Trash</strong> removes your post from this list and places it in the trash, from which you can permanently delete it.') . '</li>' .
</span><span class="cx"> '<li>' . __('<strong>Preview</strong> will show you what your draft post will look like if you publish it. View will take you to your live site to view the post. Which link is available depends on your post&#8217;s status.') . '</li>' .
</span><del>- '</ul>'
</del><ins>+ '</ul>'
</ins><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'bulk-actions',
</span><span class="cx"> 'title' => __('Bulk Actions'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('You can also edit or move multiple posts to the trash at once. Select the posts you want to act on using the checkboxes, then select the action you want to take from the Bulk Actions menu and click Apply.') . '</p>' .
</span><span class="cx"> '<p>' . __('When using Bulk Edit, you can change the metadata (categories, author, etc.) for all selected posts at once. To remove a post from the grouping, just click the x next to its name in the Bulk Edit area that appears.') . '</p>'
</span><span class="cx"> ) );
</span><span class="lines">@@ -192,18 +192,18 @@
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>') . '</p>' .
</span><span class="cx"> '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
</span><span class="cx"> );
</span><del>-
</del><ins>+
</ins><span class="cx"> } elseif ( 'page' == $post_type ) {
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('Pages are similar to posts in that they have a title, body text, and associated metadata, but they are different in that they are not part of the chronological blog stream, kind of like permanent posts. Pages are not categorized or tagged, but can have a hierarchy. You can nest pages under other pages by making one the &#8220;Parent&#8221; of the other, creating a group of pages.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'managing-pages',
</span><span class="cx"> 'title' => __('Managing Pages'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('Managing pages is very similar to managing posts, and the screens can be customized in the same way.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can also perform the same types of actions, including narrowing the list by using the filters, acting on a page using the action links that appear when you hover over a row, or using the Bulk Actions menu to edit the metadata for multiple pages at once.') . '</p>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-media-list-table.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-media-list-table.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/includes/class-wp-media-list-table.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -303,8 +303,8 @@
</span><span class="cx"> <?php if( current_user_can( 'edit_post', $post->post_parent ) ) { ?>
</span><span class="cx"> <a href="<?php echo get_edit_post_link( $post->post_parent ); ?>">
</span><span class="cx"> <?php echo $title ?></a>
</span><del>- <?php } else {
- echo $title;
</del><ins>+ <?php } else {
+ echo $title;
</ins><span class="cx"> } ?></strong>,
</span><span class="cx"> <?php echo get_the_time( __( 'Y/m/d' ) ); ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/includes/dashboard.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -1342,7 +1342,7 @@
</span><span class="cx"> <li><?php echo sprintf( __( '<a href="%s">Select a new header image</a>' ), esc_url( admin_url( 'themes.php?page=custom-header' ) ) ); ?></li>
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( current_theme_supports( 'widgets' ) ) : ?>
</span><span class="cx"> <li><?php echo sprintf( __( '<a href="%s">Add some widgets</a>' ), esc_url( admin_url( 'widgets.php' ) ) ); ?></li>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/includes/media.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -1611,7 +1611,7 @@
</span><span class="cx"> $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id");
</span><span class="cx"> $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type);
</span><span class="cx"> $form_class = 'media-upload-form validate';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( get_user_setting('uploader') )
</span><span class="cx"> $form_class .= ' html-uploader';
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/js/common.dev.js 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if ( tab )
</span><span class="cx"> node.attr('tabindex', '0').attr('tabindex', tab);
</span><span class="cx"> };
</span><del>-
</del><ins>+
</ins><span class="cx"> $('#collapse-menu', menu).click(function(){
</span><span class="cx"> var body = $(document.body);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjseditordevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/editor.dev.js (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/editor.dev.js 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/js/editor.dev.js 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -3,14 +3,14 @@
</span><span class="cx">
</span><span class="cx"> switchto: function(el) {
</span><span class="cx"> var aid = el.id, l = aid.length, id = aid.substr(0, l - 5), mode = aid.substr(l - 4);
</span><del>-
</del><ins>+
</ins><span class="cx"> this.go(id, mode);
</span><span class="cx"> },
</span><del>-
</del><ins>+
</ins><span class="cx"> go: function(id, mode) { // mode can be 'html', 'tmce', or 'toggle'
</span><span class="cx"> id = id || 'content';
</span><span class="cx"> mode = mode || 'toggle';
</span><del>-
</del><ins>+
</ins><span class="cx"> var t = this, ed = tinyMCE.get(id), wrap_id, txtarea_el, dom = tinymce.DOM;
</span><span class="cx">
</span><span class="cx"> wrap_id = 'wp-'+id+'-wrap';
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx"> mode = 'html';
</span><span class="cx"> else
</span><span class="cx"> mode = 'tmce';
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( 'tmce' == mode || 'tinymce' == mode ) {
</span><span class="cx"> if ( ed && ! ed.isHidden() )
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/link-manager.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . sprintf(__('You can add links here to be displayed on your site, usually using <a href="%s">Widgets</a>. By default, links to several sites in the WordPress community are included as examples.'), 'widgets.php') . '</p>' .
</span><span class="cx"> '<p>' . __('Links may be separated into Link Categories; these are different than the categories used on your posts.') . '</p>' .
</span><span class="cx"> '<p>' . __('You can customize the display of this screen using the Screen Options tab and/or the dropdown filters above the links table.') . '</p>'
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'deleting-links',
</span><span class="cx"> 'title' => __('Deleting Links'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('If you delete a link, it will be removed permanently, as Links do not have a Trash function yet.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/media-upload.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> '<li>' . __('<strong>Select Files</strong> will open the multi-file uploader, or you can use the <strong>Browser Uploader</strong>.') . '</li>' .
</span><span class="cx"> '<li>' . __('Clicking <strong>Select Files</strong> opens a navigation window showing you files in your operating system. Selecting <strong>Open</strong> after clicking on the file you want activates a progress bar on the uploader screen.') . '</li>' .
</span><span class="cx"> '</ul>' .
</span><del>- '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
</del><ins>+ '<p>' . __('Basic image editing is available after upload is complete. Make sure you click Save before leaving this screen.') . '</p>'
</ins><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> require_once('./admin-header.php');
</span><del>-
</del><ins>+
</ins><span class="cx"> $form_class = 'media-upload-form type-form validate';
</span><span class="cx">
</span><span class="cx"> if ( get_user_setting('uploader') )
</span></span></pre></div>
<a id="trunkwpadminmenuheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu-header.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu-header.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/menu-header.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> $class[] = 'wp-not-current-submenu';
</span><span class="cx"> if ( ! empty( $submenu_items ) )
</span><del>- $aria_attributes .= ' aria-haspopup="true"';
</del><ins>+ $aria_attributes .= ' aria-haspopup="true"';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ! empty( $item[4] ) )
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/nav-menus.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'create-menus',
</span><span class="cx"> 'title' => __('Create Menus'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<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. Drop the item into its new nested placement when the dotted rectangle target shifts over, also a little to the right. Don&#8217;t forget to click Save when you&#8217;re finished.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/plugin-editor.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>- 'content' =>
</del><ins>+ 'content' =>
</ins><span class="cx"> '<p>' . __('You can use the editor to make changes to any of your plugins&#8217; individual PHP files. Be aware that if you make changes, plugins updates will overwrite your customizations.') . '</p>' .
</span><span class="cx"> '<p>' . __('Choose a plugin to edit from the menu in the upper right and click the Select button. Click once on any file name to load it in the editor, and make your changes. Don&#8217;t forget to save your changes (Update File) when you&#8217;re finished.') . '</p>' .
</span><span class="cx"> '<p>' . __('The Documentation menu below the editor lists the PHP functions recognized in the plugin file. Clicking Lookup takes you to a web page about that particular function.') . '</p>' .
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/plugin-install.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . sprintf(__('Plugins hook into WordPress to extend its functionality with custom features. Plugins are developed independently from the core WordPress application by thousands of developers all over the world. All plugins in the official <a href="%s" target="_blank">WordPress.org Plugin Directory</a> are compatible with the license WordPress uses. You can find new plugins to install by searching or browsing the Directory right here in your own Plugins section.'), 'http://wordpress.org/extend/plugins/') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'adding-plugins',
</span><span class="cx"> 'title' => __('Adding Plugins'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('If you know what you&#8217;re looking for, Search is your best bet. The Search screen has options to search the WordPress.org Plugin Directory for a particular Term, Author, or Tag. You can also search the directory by selecting a popular tags. Tags in larger type mean more plugins have been labeled with that tag.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you just want to get an idea of what&#8217;s available, you can browse Featured, Popular, Newest, and Recently Updated plugins by using the links in the upper left of the screen. These sections rotate regularly.') . '</p>' .
</span><span class="cx"> '<p>' . __('If you want to install a plugin that you&#8217;ve downloaded elsewhere, click the Upload in the upper left. You will be prompted to upload the .zip package, and once uploaded, you can activate the new plugin.') . '</p>'
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/plugins.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -321,14 +321,14 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><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" target="_blank">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"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'compatibility-problems',
</span><span class="cx"> 'title' => __('Troubleshooting'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><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><span class="cx"> '<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>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/theme-editor.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('You can use the Theme Editor to edit the individual CSS and PHP files which make up your theme.') . '</p>
</span><span class="cx"> <p>' . __('Begin by choosing a theme to edit from the dropdown menu and clicking Select. A list then appears of all the template files. Clicking once on any file name causes the file to appear in the large Editor box.') . '</p>
</span><span class="cx"> <p>' . __('For PHP files, you can use the Documentation dropdown to select from functions recognized in that file. Lookup takes you to a web page with reference material about that particular function.') . '</p>
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/update-core.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> $submit = __('Re-install Now');
</span><span class="cx"> $form_action = 'update-core.php?action=do-core-reinstall';
</span><span class="cx"> } else {
</span><del>- $php_compat = version_compare( $php_version, $update->php_version, '>=' );
</del><ins>+ $php_compat = version_compare( $php_version, $update->php_version, '>=' );
</ins><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) )
</span><span class="cx"> $mysql_compat = true;
</span><span class="cx"> else
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('This screen lets you update to the latest version of WordPress as well as update your themes and plugins from the WordPress.org repository. When updates are available, the number of available updates will appear in a bubble on the left hand menu as a notification.') . '</p>' .
</span><span class="cx"> '<p>' . __('It is very important to keep your WordPress installation up to date for security reasons, so when you see a number appear, make sure you take the time to update, which is an easy process.') . '</p>'
</span><span class="cx"> ) );
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'how-to-update',
</span><span class="cx"> 'title' => __('How to Update'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('Updating your WordPress installation is a simple one-click procedure; just click on the Update button when it says a new version is available.') . '</p>' .
</span><span class="cx"> '<p>' . __('To update themes or plugins from this screen, use the checkboxes to make your selection and click on the appropriate Update button. Check the box at the top of the Themes or Plugins section to select all and update them all at once.') . '</p>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/upload.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
</span><span class="cx"> '<p>' . __( 'You can narrow the list by file type/status using the text link filters at the top of the screen. You also can refine the list by date using the dropdown menu above the media table.' ) . '</p>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/user-new.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -151,15 +151,15 @@
</span><span class="cx">
</span><span class="cx"> $help .= '<p>' . __('Remember to click the Add New User button at the bottom of this screen when you are finished.') . '</p>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
- 'id' => 'overview',
- 'title' => __('Overview'),
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'overview',
+ 'title' => __('Overview'),
</ins><span class="cx"> 'content' => $help,
</span><span class="cx"> ) );
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
-'id' => 'user-roles',
-'title' => __('User Roles'),
</del><ins>+get_current_screen()->add_help_tab( array(
+'id' => 'user-roles',
+'title' => __('User Roles'),
</ins><span class="cx"> 'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
</span><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/users.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -20,25 +20,25 @@
</span><span class="cx"> add_screen_option( 'per_page', array('label' => _x( 'Users', 'users per page (screen options)' )) );
</span><span class="cx">
</span><span class="cx"> // contextual help - choose Help on the top right of admin panel to preview this.
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'overview',
</span><del>- 'title' => __('Overview'),
</del><ins>+ 'title' => __('Overview'),
</ins><span class="cx"> 'content' => '<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 in the dashboard navigation when they are logged in, based on their role.') . '</p>' .
</span><span class="cx"> '<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>'
</span><span class="cx"> ) ) ;
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
</del><ins>+get_current_screen()->add_help_tab( array(
</ins><span class="cx"> 'id' => 'screen-display',
</span><del>- 'title' => __('Screen Display'),
- 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
- '<ul>' .
- '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
- '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
- '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
- '</ul>'
-) );
</del><ins>+ 'title' => __('Screen Display'),
+ 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
+ '<ul>' .
+ '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
+ '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
+ '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
+ '</ul>'
+) );
</ins><span class="cx">
</span><del>-$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
</del><ins>+$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
</ins><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
</span><span class="cx">
</span><span class="lines">@@ -49,9 +49,9 @@
</span><span class="cx">
</span><span class="cx"> $help .= '</ul>';
</span><span class="cx">
</span><del>-get_current_screen()->add_help_tab( array(
- 'id' => 'actions',
- 'title' => __('Actions'),
</del><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'actions',
+ 'title' => __('Actions'),
</ins><span class="cx"> 'content' => $help,
</span><span class="cx"> ) );
</span><span class="cx"> unset( $help );
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-admin/widgets.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -38,14 +38,14 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
</span><span class="cx"> <p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
</span><span class="cx"> ) );
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'removing-reusing',
</span><span class="cx"> 'title' => __('Removing and Reusing'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
</span><span class="cx"> <p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
</span><span class="cx"> <p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span><span class="cx"> 'id' => 'missing-widgets',
</span><span class="cx"> 'title' => __('Missing Widgets'),
</span><del>-'content' =>
</del><ins>+'content' =>
</ins><span class="cx"> '<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
</span><span class="cx"> '<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive area, where all your widgets and their settings will have been saved.') . '</p>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-includes/functions.wp-scripts.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -80,10 +80,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $handle The script handle that was registered or used in script-loader
</span><span class="cx"> * @param string $object_name Name for the created JS object. This is passed directly so it should be qualified JS variable /[a-zA-Z0-9_]+/
</span><del>- * @param array $l10n Associative PHP array containing the translated strings. HTML entities will be converted and the array will be JSON encoded.
</del><ins>+ * @param array $l10n Associative PHP array containing the translated strings. HTML entities will be converted and the array will be JSON encoded.
</ins><span class="cx"> * @return bool Whether the localization was added successfully.
</span><span class="cx"> */
</span><del>-function wp_localize_script( $handle, $object_name, $l10n ) {
</del><ins>+function wp_localize_script( $handle, $object_name, $l10n ) {
</ins><span class="cx"> global $wp_scripts;
</span><span class="cx"> if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
</span><span class="cx"> if ( ! did_action( 'init' ) )
</span><span class="lines">@@ -93,8 +93,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return $wp_scripts->localize( $handle, $object_name, $l10n );
-}
</del><ins>+ return $wp_scripts->localize( $handle, $object_name, $l10n );
+}
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Adds extra Javascript.
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (19527 => 19528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2011-12-01 04:49:57 UTC (rev 19527)
+++ trunk/wp-includes/general-template.php 2011-12-01 04:51:35 UTC (rev 19528)
</span><span class="lines">@@ -1789,13 +1789,13 @@
</span><span class="cx"> *
</span><span class="cx"> * Using this function is the proper way to output all needed components for both TinyMCE and Quicktags.
</span><span class="cx"> * _WP_Editors should not be used directly. See http://core.trac.wordpress.org/ticket/17144.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * NOTE: Once initialized the TinyMCE editor cannot be safely moved in the DOM. For that reason
</span><span class="cx"> * running wp_editor() inside of a metabox is not a good idea unless only Quicktags is used.
</span><span class="cx"> * On the post edit screen several actions can be used to include additional editors
</span><span class="cx"> * containing TinyMCE: 'edit_page_form', 'edit_form_advanced' and 'dbx_post_sidebar'.
</span><span class="cx"> * See http://core.trac.wordpress.org/ticket/19173 for more information.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @see wp-includes/class-wp-editor.php
</span><span class="cx"> * @since 3.3
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>