<!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>[14404] trunk: Strip trailing whites.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14404">14404</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-03 20:26:11 +0000 (Mon, 03 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Strip trailing whites.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincssmsdevcss">trunk/wp-admin/css/ms.dev.css</a></li>
<li><a href="#trunkwpadmincssnavmenurtldevcss">trunk/wp-admin/css/nav-menu-rtl.dev.css</a></li>
<li><a href="#trunkwpadmincssnavmenudevcss">trunk/wp-admin/css/nav-menu.dev.css</a></li>
<li><a href="#trunkwpadmincsspressthisdevcss">trunk/wp-admin/css/press-this.dev.css</a></li>
<li><a href="#trunkwpadmincsswpadmindevcss">trunk/wp-admin/css/wp-admin.dev.css</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminjscustombackgrounddevjs">trunk/wp-admin/js/custom-background.dev.js</a></li>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</a></li>
<li><a href="#trunkwpadminjsthemepreviewdevjs">trunk/wp-admin/js/theme-preview.dev.js</a></li>
<li><a href="#trunkwpadminmsdeletesitephp">trunk/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.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="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclassoembedphp">trunk/wp-includes/class-oembed.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.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="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.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 (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/admin-ajax.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> case 'menu-quick-search':
</span><span class="cx">         if ( ! current_user_can( 'switch_themes' ) )
</span><span class="cx">                 die('-1');
</span><del>-        
</del><ins>+
</ins><span class="cx">         require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
</span><span class="cx"> 
</span><span class="cx">         _wp_ajax_menu_quick_search( $_REQUEST );
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> case 'delete-menu-item' :
</span><span class="cx">         $menu_item_id = (int) $_POST['menu-item'];
</span><span class="cx">         check_admin_referer( 'delete-menu_item_' . $menu_item_id );
</span><del>-        if ( ! current_user_can( 'switch_themes' ) ) 
</del><ins>+        if ( ! current_user_can( 'switch_themes' ) )
</ins><span class="cx">                 die('-1');
</span><span class="cx"> 
</span><span class="cx">         if ( is_nav_menu_item( $menu_item_id ) &amp;&amp; wp_delete_post( $menu_item_id, true ) )
</span><span class="lines">@@ -827,12 +827,12 @@
</span><span class="cx">         $menu_id = (int) $_POST['menu'];
</span><span class="cx">         if ( isset( $_POST['menu-item'] ) ) {
</span><span class="cx">                 $item_ids = wp_save_nav_menu_item( $menu_id, $_POST['menu-item'] );
</span><del>-                if ( is_wp_error( $item_ids ) ) 
</del><ins>+                if ( is_wp_error( $item_ids ) )
</ins><span class="cx">                         die('-1');
</span><span class="cx">         } else {
</span><span class="cx">                 $item_ids = array();
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         foreach ( (array) $item_ids as $menu_item_id ) {
</span><span class="cx">                 $menu_obj = get_post( $menu_item_id );
</span><span class="cx">                 if ( ! empty( $menu_obj-&gt;ID ) ) {
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx">                         'context' =&gt; 'backend',
</span><span class="cx">                         'link_after' =&gt; '',
</span><span class="cx">                         'link_before' =&gt; '',
</span><del>-                        'walker' =&gt; new Walker_Nav_Menu_Edit, 
</del><ins>+                        'walker' =&gt; new Walker_Nav_Menu_Edit,
</ins><span class="cx">                 );
</span><span class="cx">                 echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
</span><span class="cx">         }
</span><span class="lines">@@ -1093,7 +1093,7 @@
</span><span class="cx"> case 'menu-quick-search':
</span><span class="cx">         if ( ! current_user_can( 'switch_themes' ) )
</span><span class="cx">                 die('-1');
</span><del>-        
</del><ins>+
</ins><span class="cx">         require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
</span><span class="cx"> 
</span><span class="cx">         _wp_ajax_menu_quick_search( $_REQUEST );
</span></span></pre></div>
<a id="trunkwpadmincssmsdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ms.dev.css (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ms.dev.css        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/css/ms.dev.css        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx">         font-size: 16px;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#dashboard_right_now div.musubtable { 
-        border-top: none; 
</del><ins>+#dashboard_right_now div.musubtable {
+        border-top: none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /* No drag and drop on ms-sites.php */
</span></span></pre></div>
<a id="trunkwpadmincssnavmenurtldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu-rtl.dev.css (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu-rtl.dev.css        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/css/nav-menu-rtl.dev.css        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><del>-.howto span { 
-        float: right; 
</del><ins>+.howto span {
+        float: right;
</ins><span class="cx"> }
</span><del>-.menu-item-textbox { 
-        float: left; 
</del><ins>+.menu-item-textbox {
+        float: left;
</ins><span class="cx"> }
</span><del>-.add-to-menu { 
-        float: left; 
</del><ins>+.add-to-menu {
+        float: left;
</ins><span class="cx"> }
</span><span class="cx"> .menu-item-title input[type=&quot;checkbox&quot;] {
</span><del>-        margin-left: 3px; 
</del><ins>+        margin-left: 3px;
</ins><span class="cx"> }
</span><span class="cx"> .menu li dl dt {
</span><span class="cx">         padding-left: 0;
</span><span class="lines">@@ -16,17 +16,17 @@
</span><span class="cx"> }
</span><span class="cx"> .menu li ul li {
</span><span class="cx">         margin-left: 0;
</span><del>-        margin-right: 20px; 
</del><ins>+        margin-right: 20px;
</ins><span class="cx"> }
</span><del>-.menu li .item-title { 
</del><ins>+.menu li .item-title {
</ins><span class="cx">         margin-right: 0;
</span><del>-        margin-left: 18em; 
</del><ins>+        margin-left: 18em;
</ins><span class="cx"> }
</span><del>-.item-controls { 
</del><ins>+.item-controls {
</ins><span class="cx">         right: auto;
</span><del>-        left: 15px; 
</del><ins>+        left: 15px;
</ins><span class="cx"> }
</span><span class="cx"> .item-type {
</span><span class="cx">         padding-right: 0;
</span><del>-        padding-left: 10px; 
</del><ins>+        padding-left: 10px;
</ins><span class="cx"> }
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadmincssnavmenudevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/nav-menu.dev.css (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/nav-menu.dev.css        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/css/nav-menu.dev.css        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -55,12 +55,12 @@
</span><span class="cx">         #menu-management .menu-edit {
</span><span class="cx">                 margin-bottom: 20px;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         #nav-menu-header, #post-body {
</span><span class="cx">                 border-color: #ccc;
</span><span class="cx">                 border-style: solid;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         #nav-menu-header {
</span><span class="cx">                 background: url(&quot;../images/gray-grad.png&quot;) repeat-x scroll left top #dfdfdf;
</span><span class="cx">                 border-width: 1px 1px 0 1px;
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx">                 -khtml-border-top-right-radius: 6px;
</span><span class="cx">                 border-top-right-radius: 6px;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         #post-body {
</span><span class="cx">                 background: #fff;
</span><span class="cx">                 padding:0 0 10px 10px;
</span><span class="lines">@@ -87,11 +87,11 @@
</span><span class="cx">                 -khtml-border-bottom-right-radius: 6px;
</span><span class="cx">                 border-bottom-right-radius: 6px;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         #post-body-content {
</span><span class="cx">                 position: relative;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         .post-body-plain {
</span><span class="cx">                 padding: 10px 10px 0 0;
</span><span class="cx">         }
</span><span class="lines">@@ -99,9 +99,9 @@
</span><span class="cx">         #menu-management .menu-add-new abbr {
</span><span class="cx">                 font-weight:bold;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx"> /* Menu Tabs */
</span><del>-        
</del><ins>+
</ins><span class="cx"> #menu-management .nav-tabs-nav {
</span><span class="cx">         margin: 0 20px;
</span><span class="cx"> }
</span><span class="lines">@@ -162,12 +162,12 @@
</span><span class="cx">         text-align: right;
</span><span class="cx">         padding: 0 10px 3px 10px;
</span><span class="cx">         margin-bottom: 5px;
</span><del>-}        
</del><ins>+}
</ins><span class="cx">         #select-nav-menu {
</span><span class="cx">                 width: 100px;
</span><span class="cx">                 display: inline;
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx"> /* Menu Toolbar */
</span><span class="cx"> #menu-management #major-publishing-actions #delete-action {
</span><span class="cx">         float: right;
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> #wpbody .open-label span {
</span><span class="cx">         padding-right: 10px;
</span><span class="cx"> }
</span><del>-        
</del><ins>+
</ins><span class="cx">         .js .input-with-default-title {
</span><span class="cx">                 color: #aaa;
</span><span class="cx">                 font-style: italic;
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> 
</span><span class="cx"> /* Button Secondary Actions */
</span><span class="cx"> .list-controls { float: left; margin-top: 5px; }
</span><del>-.add-to-menu { 
</del><ins>+.add-to-menu {
</ins><span class="cx">         float: right;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> .menu ul { width: 100%; }
</span><span class="cx"> .menu ul.sub-menu {
</span><span class="cx"> }
</span><del>-.menu li { 
</del><ins>+.menu li {
</ins><span class="cx">         margin-bottom: 0;
</span><span class="cx"> }
</span><span class="cx"> .menu li dl {
</span><span class="lines">@@ -276,12 +276,12 @@
</span><span class="cx"> }
</span><span class="cx"> .menu li dl dt {
</span><span class="cx">         background: url(&quot;../images/gray-grad.png&quot;) repeat-x scroll left top #DFDFDF;
</span><del>-        border: 1px solid #E6E6E6; 
</del><ins>+        border: 1px solid #E6E6E6;
</ins><span class="cx">         clear:both;
</span><del>-        position: relative; 
</del><ins>+        position: relative;
</ins><span class="cx">         padding-left: 10px;
</span><span class="cx">         height: auto;
</span><del>-        width: 400px; 
</del><ins>+        width: 400px;
</ins><span class="cx">         line-height: 35px;
</span><span class="cx">         text-shadow: 0 1px 0 #FFFFFF;
</span><span class="cx">         font-weight:bold;
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> }
</span><span class="cx"> .menu li dl.menu-item-edit-inactive dt {
</span><span class="cx">         border-radius: 6px;
</span><del>-        -webkit-border-radius: 6px; 
</del><ins>+        -webkit-border-radius: 6px;
</ins><span class="cx">         -moz-border-radius: 6px;
</span><span class="cx">         -khtml-border-radius: 6px;
</span><span class="cx"> }
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx">         background-color:#faa;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-.menu li .item-title { 
</del><ins>+.menu li .item-title {
</ins><span class="cx">         padding: 7px 0;
</span><span class="cx">         line-height: 20px;
</span><span class="cx">         display:block;
</span><span class="lines">@@ -424,9 +424,9 @@
</span><span class="cx">         font-size: 11px;
</span><span class="cx">         color: #777;
</span><span class="cx">         font-style: italic;
</span><del>-        border: 1px solid #dfdfdf;        
</del><ins>+        border: 1px solid #dfdfdf;
</ins><span class="cx">         border-radius: 6px;
</span><del>-        -webkit-border-radius: 6px; 
</del><ins>+        -webkit-border-radius: 6px;
</ins><span class="cx">         -moz-border-radius: 6px;
</span><span class="cx">         -khtml-border-radius: 6px;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadmincsspressthisdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/press-this.dev.css (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this.dev.css        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/css/press-this.dev.css        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx">         font-size: 12px;
</span><span class="cx">         margin: 1px;
</span><span class="cx"> }
</span><del>-        
</del><ins>+
</ins><span class="cx"> .category-add select {
</span><span class="cx">         width: 100%;
</span><span class="cx">         -x-system-font: none;
</span></span></pre></div>
<a id="trunkwpadmincsswpadmindevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/wp-admin.dev.css (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/wp-admin.dev.css        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/css/wp-admin.dev.css        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -2014,11 +2014,11 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> div.tabs-panel-active {
</span><del>-        display:block;        
</del><ins>+        display:block;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> div.tabs-panel-inactive {
</span><del>-        display:none;        
</del><ins>+        display:none;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #post-body .categorydiv div.tabs-panel,
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/custom-background.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> &lt;tr valign=&quot;top&quot;&gt;
</span><span class="cx"> &lt;th scope=&quot;row&quot;&gt;&lt;?php _e('Current Image'); ?&gt;&lt;/th&gt;
</span><span class="cx"> &lt;td&gt;
</span><del>-&lt;style type=&quot;text/css&quot;&gt; 
</del><ins>+&lt;style type=&quot;text/css&quot;&gt;
</ins><span class="cx"> #custom-background-image {
</span><span class="cx">         background-color: #&lt;?php echo get_background_color()?&gt;;
</span><span class="cx">         &lt;?php if ( get_background_image() ) { ?&gt;
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">         background-attachment: &lt;?php echo get_theme_mod('background_position', 'fixed'); ?&gt;;
</span><span class="cx">         &lt;?php } ?&gt;
</span><span class="cx"> }
</span><del>-&lt;/style&gt; 
</del><ins>+&lt;/style&gt;
</ins><span class="cx"> &lt;div id=&quot;custom-background-image&quot;&gt;
</span><span class="cx"> &lt;?php if ( get_background_image() ) { ?&gt;
</span><span class="cx"> &lt;img class=&quot;custom-background-image&quot; src=&quot;&lt;?php echo get_theme_mod('background_image_thumb', ''); ?&gt;&quot; style=&quot;visibility:hidden;&quot; /&gt;&lt;br /&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/file.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -641,7 +641,7 @@
</span><span class="cx">                         continue;
</span><span class="cx"> 
</span><span class="cx">                 if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Don't extract the OS X-created __MACOSX directory files
</span><del>-                        continue; 
</del><ins>+                        continue;
</ins><span class="cx"> 
</span><span class="cx">                 $contents = $z-&gt;getFromIndex($i);
</span><span class="cx">                 if ( false === $contents )
</span><span class="lines">@@ -685,9 +685,9 @@
</span><span class="cx"> 
</span><span class="cx">         // Determine any children directories needed (From within the archive)
</span><span class="cx">         foreach ( $archive_files as $file ) {
</span><del>-                if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory 
</del><ins>+                if ( '__MACOSX/' === substr($file['filename'], 0, 9) ) // Skip the OS X-created __MACOSX directory
</ins><span class="cx">                         continue;
</span><del>-        
</del><ins>+
</ins><span class="cx">                 $needed_dirs[] = $to . untrailingslashit( $file['folder'] ? $file['filename'] : dirname($file['filename']) );
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/media.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -2160,7 +2160,7 @@
</span><span class="cx"> function _insert_into_post_button($type) {
</span><span class="cx">         if ( !post_type_supports(get_post_type($_GET['post_id']), 'editor') )
</span><span class="cx">                 return '';
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( 'image' == $type )
</span><span class="cx">         return '
</span><span class="cx">                 &lt;tr&gt;
</span><span class="lines">@@ -2168,7 +2168,7 @@
</span><span class="cx">                         &lt;td&gt;
</span><span class="cx">                                 &lt;input type=&quot;button&quot; class=&quot;button&quot; id=&quot;go_button&quot; style=&quot;color:#bbb;&quot; onclick=&quot;addExtImage.insert()&quot; value=&quot;' . esc_attr__('Insert into Post') . '&quot; /&gt;
</span><span class="cx">                         &lt;/td&gt;
</span><del>-                &lt;/tr&gt;                
</del><ins>+                &lt;/tr&gt;
</ins><span class="cx">         ';
</span><span class="cx"> 
</span><span class="cx">         return '
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/meta-boxes.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx">         $help_hint  = isset( $taxonomy-&gt;help_hint  ) ? $taxonomy-&gt;help_hint         : __('Add new tag');
</span><span class="cx">         $help_nojs  = isset( $taxonomy-&gt;help_nojs  ) ? $taxonomy-&gt;help_nojs         : __('Add or remove tags');
</span><span class="cx">         $help_cloud = isset( $taxonomy-&gt;help_cloud ) ? $taxonomy-&gt;help_cloud        : __('Choose from the most used tags in %s');
</span><del>-        
</del><ins>+
</ins><span class="cx">         $disabled = !current_user_can($taxonomy-&gt;assign_cap) ? 'disabled=&quot;disabled&quot;' : '';
</span><span class="cx"> ?&gt;
</span><span class="cx"> &lt;div class=&quot;tagsdiv&quot; id=&quot;&lt;?php echo $tax_name; ?&gt;&quot;&gt;
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/ms.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -452,7 +452,7 @@
</span><span class="cx">                 /* translators: Gigabytes */
</span><span class="cx">                 $space .= __( 'GB' );
</span><span class="cx">         } else {
</span><del>-                /* translators: Megabytes */                
</del><ins>+                /* translators: Megabytes */
</ins><span class="cx">                 $space .= __( 'MB' );
</span><span class="cx">         }
</span><span class="cx">         ?&gt;
</span><span class="lines">@@ -546,7 +546,7 @@
</span><span class="cx"> 
</span><span class="cx"> function format_code_lang( $code = '' ) {
</span><span class="cx">         $code = strtolower( substr( $code, 0, 2 ) );
</span><del>-        $lang_codes = array( 
</del><ins>+        $lang_codes = array(
</ins><span class="cx">                 'aa' =&gt; 'Afar', 'ab' =&gt; 'Abkhazian', 'af' =&gt; 'Afrikaans', 'ak' =&gt; 'Akan', 'sq' =&gt; 'Albanian', 'am' =&gt; 'Amharic', 'ar' =&gt; 'Arabic', 'an' =&gt; 'Aragonese', 'hy' =&gt; 'Armenian', 'as' =&gt; 'Assamese', 'av' =&gt; 'Avaric', 'ae' =&gt; 'Avestan', 'ay' =&gt; 'Aymara', 'az' =&gt; 'Azerbaijani', 'ba' =&gt; 'Bashkir', 'bm' =&gt; 'Bambara', 'eu' =&gt; 'Basque', 'be' =&gt; 'Belarusian', 'bn' =&gt; 'Bengali',
</span><span class="cx">                 'bh' =&gt; 'Bihari', 'bi' =&gt; 'Bislama', 'bs' =&gt; 'Bosnian', 'br' =&gt; 'Breton', 'bg' =&gt; 'Bulgarian', 'my' =&gt; 'Burmese', 'ca' =&gt; 'Catalan; Valencian', 'ch' =&gt; 'Chamorro', 'ce' =&gt; 'Chechen', 'zh' =&gt; 'Chinese', 'cu' =&gt; 'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic', 'cv' =&gt; 'Chuvash', 'kw' =&gt; 'Cornish', 'co' =&gt; 'Corsican', 'cr' =&gt; 'Cree',
</span><span class="cx">                 'cs' =&gt; 'Czech', 'da' =&gt; 'Danish', 'dv' =&gt; 'Divehi; Dhivehi; Maldivian', 'nl' =&gt; 'Dutch; Flemish', 'dz' =&gt; 'Dzongkha', 'en' =&gt; 'English', 'eo' =&gt; 'Esperanto', 'et' =&gt; 'Estonian', 'ee' =&gt; 'Ewe', 'fo' =&gt; 'Faroese', 'fj' =&gt; 'Fijjian', 'fi' =&gt; 'Finnish', 'fr' =&gt; 'French', 'fy' =&gt; 'Western Frisian', 'ff' =&gt; 'Fulah', 'ka' =&gt; 'Georgian', 'de' =&gt; 'German', 'gd' =&gt; 'Gaelic; Scottish Gaelic',
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( $code_lang == 'en_US' ) { // American English
</span><span class="cx">                         $flag = true;
</span><del>-                        $ae = __( 'American English' ); 
</del><ins>+                        $ae = __( 'American English' );
</ins><span class="cx">                         $output[$ae] = '&lt;option value=&quot;' . esc_attr( $code_lang ) . '&quot;' . selected( $current, $code_lang ) . '&gt; ' . $ae . '&lt;/option&gt;';
</span><span class="cx">                 } elseif ( $code_lang == 'en_GB' ) { // British English
</span><span class="cx">                         $flag = true;
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/nav-menu.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">          * @param int $depth Depth of page.
</span><span class="cx">          */
</span><span class="cx">         function start_lvl(&amp;$output, $depth) {}
</span><del>-        
</del><ins>+
</ins><span class="cx">         /**
</span><span class="cx">          * @see Walker_Nav_Menu::end_lvl()
</span><span class="cx">          * @since 3.0.0
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">          * @param int $depth Depth of page.
</span><span class="cx">          */
</span><span class="cx">         function end_lvl(&amp;$output, $depth) {}
</span><del>-        
</del><ins>+
</ins><span class="cx">         /**
</span><span class="cx">          * @see Walker::start_el()
</span><span class="cx">          * @since 3.0.0
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">                         'page-tab',
</span><span class="cx">                         '_wpnonce',
</span><span class="cx">                 );
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $original_title = '';
</span><span class="cx">                 if ( 'taxonomy' == $item-&gt;type ) {
</span><span class="cx">                         $original_title = get_term_field( 'name', $item-&gt;object_id, $item-&gt;object, 'raw' );
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">                 }
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;li id=&quot;menu-item-&lt;?php echo $item_id; ?&gt;&quot; class=&quot;menu-item menu-item-depth-&lt;?php echo $depth; ?&gt; menu-item-&lt;?php echo strtolower(esc_attr( $item-&gt;append )); ?&gt;&quot;&gt;
</span><del>-                        &lt;dl class=&quot;&lt;?php 
</del><ins>+                        &lt;dl class=&quot;&lt;?php
</ins><span class="cx">                                 if ( isset($_GET['edit-menu-item']) &amp;&amp; $item_id == $_GET['edit-menu-item'] )
</span><span class="cx">                                         echo 'menu-item-edit-active';
</span><span class="cx">                                 else
</span><span class="lines">@@ -71,44 +71,44 @@
</span><span class="cx">                                                 &lt;span class=&quot;item-type&quot;&gt;&lt;?php echo esc_html( $item-&gt;append ); ?&gt;&lt;/span&gt;
</span><span class="cx">                                                 &lt;span class=&quot;item-order&quot;&gt;
</span><span class="cx">                                                         &lt;a href=&quot;&lt;?php
</span><del>-                                                                echo wp_nonce_url( 
</del><ins>+                                                                echo wp_nonce_url(
</ins><span class="cx">                                                                         add_query_arg(
</span><span class="cx">                                                                                 array(
</span><del>-                                                                                        'action' =&gt; 'move-up-menu-item', 
</del><ins>+                                                                                        'action' =&gt; 'move-up-menu-item',
</ins><span class="cx">                                                                                         'menu-item' =&gt; $item_id,
</span><span class="cx">                                                                                 ),
</span><del>-                                                                                remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) 
-                                                                        ), 
-                                                                        'move-item' 
-                                                                ); 
</del><ins>+                                                                                remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+                                                                        ),
+                                                                        'move-item'
+                                                                );
</ins><span class="cx">                                                         ?&gt;&quot; class=&quot;item-move-up&quot;&gt;&lt;abbr title=&quot;&lt;?php esc_attr_e('Move up'); ?&gt;&quot;&gt;&amp;#8593;&lt;/abbr&gt;&lt;/a&gt;
</span><span class="cx">                                                         |
</span><span class="cx">                                                         &lt;a href=&quot;&lt;?php
</span><del>-                                                                echo wp_nonce_url( 
</del><ins>+                                                                echo wp_nonce_url(
</ins><span class="cx">                                                                         add_query_arg(
</span><span class="cx">                                                                                 array(
</span><del>-                                                                                        'action' =&gt; 'move-down-menu-item', 
</del><ins>+                                                                                        'action' =&gt; 'move-down-menu-item',
</ins><span class="cx">                                                                                         'menu-item' =&gt; $item_id,
</span><span class="cx">                                                                                 ),
</span><del>-                                                                                remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) 
-                                                                        ), 
</del><ins>+                                                                                remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+                                                                        ),
</ins><span class="cx">                                                                         'move-item'
</span><del>-                                                                ); 
</del><ins>+                                                                );
</ins><span class="cx">                                                         ?&gt;&quot; class=&quot;item-move-down&quot;&gt;&lt;abbr title=&quot;&lt;?php esc_attr_e('Move down'); ?&gt;&quot;&gt;&amp;#8595;&lt;/abbr&gt;&lt;/a&gt;
</span><span class="cx">                                                 &lt;/span&gt;
</span><del>-                                                &lt;a class=&quot;item-edit&quot; id=&quot;edit-&lt;?php echo $item_id; ?&gt;&quot; title=&quot;&lt;?php _e('Edit Menu Item'); ?&gt;&quot; href=&quot;&lt;?php 
-                                                        echo add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) ); 
</del><ins>+                                                &lt;a class=&quot;item-edit&quot; id=&quot;edit-&lt;?php echo $item_id; ?&gt;&quot; title=&quot;&lt;?php _e('Edit Menu Item'); ?&gt;&quot; href=&quot;&lt;?php
+                                                        echo add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) );
</ins><span class="cx">                                                 ?&gt;#menu-item-settings-&lt;?php echo $item_id; ?&gt;&quot;&gt;Edit Menu Item&lt;/a&gt;
</span><span class="cx">                                         &lt;/span&gt;
</span><span class="cx">                                 &lt;/dt&gt;
</span><span class="cx">                         &lt;/dl&gt;
</span><span class="cx"> 
</span><del>-                        &lt;div class=&quot;menu-item-settings &lt;?php 
</del><ins>+                        &lt;div class=&quot;menu-item-settings &lt;?php
</ins><span class="cx">                                 if ( isset($_GET['edit-menu-item']) &amp;&amp; $item_id == $_GET['edit-menu-item'] )
</span><span class="cx">                                         echo 'menu-item-edit-active';
</span><span class="cx">                                 else
</span><span class="cx">                                         echo 'menu-item-edit-inactive';
</span><del>-                        ?&gt;&quot; id=&quot;menu-item-settings-&lt;?php echo $item_id; ?&gt;&quot;&gt;                
</del><ins>+                        ?&gt;&quot; id=&quot;menu-item-settings-&lt;?php echo $item_id; ?&gt;&quot;&gt;
</ins><span class="cx">                                 &lt;?php if( 'custom' == $item-&gt;type ) : ?&gt;
</span><span class="cx">                                         &lt;p class=&quot;field-url description description-wide&quot;&gt;
</span><span class="cx">                                                 &lt;label for=&quot;edit-menu-item-url-&lt;?php echo $item_id; ?&gt;&quot;&gt;
</span><span class="lines">@@ -157,11 +157,11 @@
</span><span class="cx">                                                 &lt;span class=&quot;description&quot;&gt;&lt;?php _e('The description will be displayed in the menu if the current theme supports it.'); ?&gt;&lt;/span&gt;
</span><span class="cx">                                         &lt;/label&gt;
</span><span class="cx">                                 &lt;/p&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;span class=&quot;menu-item-actions description-wide submitbox&quot;&gt;
</span><span class="cx">                                         &lt;?php if( 'custom' != $item-&gt;type ) : ?&gt;
</span><span class="cx">                                                 &lt;p class=&quot;link-to-original&quot;&gt;&lt;?php
</span><del>-                                                        _e('Original '); 
</del><ins>+                                                        _e('Original ');
</ins><span class="cx">                                                         echo esc_html( $item-&gt;append );
</span><span class="cx">                                                         echo &quot;:&quot;; ?&gt;
</span><span class="cx">                                                         &lt;a href=&quot;&lt;?php echo esc_attr( $item-&gt;url ); ?&gt;&quot;&gt;
</span><span class="lines">@@ -169,20 +169,20 @@
</span><span class="cx">                                                         &lt;/a&gt;
</span><span class="cx">                                                 &lt;/p&gt;
</span><span class="cx">                                         &lt;?php endif; ?&gt;
</span><del>-                                        &lt;a class=&quot;item-delete submitdelete deletion&quot; id=&quot;delete-&lt;?php echo $item_id; ?&gt;&quot; href=&quot;&lt;?php 
</del><ins>+                                        &lt;a class=&quot;item-delete submitdelete deletion&quot; id=&quot;delete-&lt;?php echo $item_id; ?&gt;&quot; href=&quot;&lt;?php
</ins><span class="cx">                                         echo wp_nonce_url(
</span><span class="cx">                                                 add_query_arg(
</span><span class="cx">                                                         array(
</span><span class="cx">                                                                 'action' =&gt; 'delete-menu-item',
</span><span class="cx">                                                                 'menu-item' =&gt; $item_id,
</span><span class="cx">                                                         ),
</span><del>-                                                        remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) ) 
</del><ins>+                                                        remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
</ins><span class="cx">                                                 ),
</span><span class="cx">                                                 'delete-menu_item_' . $item_id
</span><span class="cx">                                         ); ?&gt;&quot;&gt;&lt;?php _e('Remove'); ?&gt;&lt;/a&gt; | &lt;a class=&quot;item-close submitclose&quot; id=&quot;close-&lt;?php echo $item_id; ?&gt;&quot; href=&quot;&quot;&gt;&lt;?php _e('Close'); ?&gt;&lt;/a&gt;
</span><span class="cx">                                         &lt;input class=&quot;button-primary save-menu-item&quot; name=&quot;save_menu_item&quot; type=&quot;submit&quot; value=&quot;&lt;?php esc_attr_e('Save Menu Item'); ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;/span&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;input class=&quot;menu-item-data-append&quot; type=&quot;hidden&quot; name=&quot;menu-item-append[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo $item-&gt;append; ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;input class=&quot;menu-item-data-db-id&quot; type=&quot;hidden&quot; name=&quot;menu-item-db-id[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo $item_id; ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;input class=&quot;menu-item-data-object-id&quot; type=&quot;hidden&quot; name=&quot;menu-item-object-id[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo esc_attr( $item-&gt;object_id ); ?&gt;&quot; /&gt;
</span><span class="lines">@@ -190,7 +190,7 @@
</span><span class="cx">                                 &lt;input class=&quot;menu-item-data-parent-id&quot; type=&quot;hidden&quot; name=&quot;menu-item-parent-id[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo esc_attr( $item-&gt;post_parent ); ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;input class=&quot;menu-item-data-position&quot; type=&quot;hidden&quot; class=&quot;menu-item-position&quot; name=&quot;menu-item-position[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo esc_attr( $item-&gt;menu_order ); ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;input class=&quot;menu-item-data-type&quot; type=&quot;hidden&quot; name=&quot;menu-item-type[&lt;?php echo $item_id; ?&gt;]&quot; value=&quot;&lt;?php echo esc_attr( $item-&gt;type ); ?&gt;&quot; /&gt;
</span><del>-                        &lt;/div&gt;&lt;!-- .menu-item-settings--&gt;        
</del><ins>+                        &lt;/div&gt;&lt;!-- .menu-item-settings--&gt;
</ins><span class="cx">                         &lt;ul class=&quot;menu-item-transport&quot;&gt;&lt;/ul&gt;
</span><span class="cx">                 &lt;?php
</span><span class="cx">                 $output .= ob_get_clean();
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx">  * Prints the appropriate response to a menu quick search.
</span><span class="cx">  *
</span><span class="cx">  * @since 3.0.0
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @param array $request The unsanitized request values.
</span><span class="cx">  */
</span><span class="cx"> function _wp_ajax_menu_quick_search( $request = array() ) {
</span><span class="lines">@@ -313,15 +313,15 @@
</span><span class="cx">         add_meta_box( 'add-custom-links', __('Custom Links'), 'wp_nav_menu_item_link_meta_box', 'nav-menus', 'side', 'default' );
</span><span class="cx">         wp_nav_menu_post_type_meta_boxes();
</span><span class="cx">         wp_nav_menu_taxonomy_meta_boxes();
</span><del>-        
-        
</del><ins>+
+
</ins><span class="cx">         // Register advanced menu items (columns)
</span><span class="cx">         add_filter( 'manage_nav-menus_columns', 'wp_nav_menu_manage_columns');
</span><del>-        
</del><ins>+
</ins><span class="cx">         add_filter( 'columns_prefs_header', create_function( '', &quot;return __('Show advanced menu properties');&quot; ));
</span><del>-        
-        
-        
</del><ins>+
+
+
</ins><span class="cx">         // If first time editing, disable advanced items by default.
</span><span class="cx">         if( false === get_user_option( 'managenav-menuscolumnshidden' ) ) {
</span><span class="cx">                 $user = wp_get_current_user();
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $removed_args = array(
</span><del>-                'action', 
</del><ins>+                'action',
</ins><span class="cx">                 'customlink-tab',
</span><span class="cx">                 'edit-menu-item',
</span><span class="cx">                 'menu-item',
</span><span class="lines">@@ -476,13 +476,13 @@
</span><span class="cx">         $pagenum = isset( $_REQUEST[$post_type_name . '-tab'] ) &amp;&amp; isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</span><span class="cx">         $offset = 0 &lt; $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="cx"> 
</span><del>-        $args = array( 
-                'offset' =&gt; $offset, 
</del><ins>+        $args = array(
+                'offset' =&gt; $offset,
</ins><span class="cx">                 'order' =&gt; 'ASC',
</span><del>-                'orderby' =&gt; 'title', 
-                'posts_per_page' =&gt; $per_page, 
-                'post_type' =&gt; $post_type_name, 
-                'suppress_filters' =&gt; true, 
</del><ins>+                'orderby' =&gt; 'title',
+                'posts_per_page' =&gt; $per_page,
+                'post_type' =&gt; $post_type_name,
+                'suppress_filters' =&gt; true,
</ins><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         if ( isset( $post_type['args']-&gt;_default_query ) )
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx">                 }
</span><span class="cx">                 $parent_ids = array_unique($parent_ids);
</span><span class="cx">                 $child_ids = array_unique($child_ids);
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $missing_parents = array();
</span><span class="cx">                 do {
</span><span class="cx">                         foreach( (array) $missing_parents as $missing_parent_id ) {
</span><span class="lines">@@ -520,27 +520,27 @@
</span><span class="cx">                                 $child_ids[] = $missing_parent_id;
</span><span class="cx">                                 $parent_ids[] = $missing_parent-&gt;post_parent;
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $missing_parents = array_filter( array_diff( array_unique( $parent_ids ), array_unique( $child_ids ) ) );
</span><span class="cx"> 
</span><span class="cx">                 } while( 0 &lt; count( $missing_parents ) );
</span><del>-                
</del><ins>+
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $page_links = paginate_links( array(
</span><del>-                'base' =&gt; add_query_arg( 
</del><ins>+                'base' =&gt; add_query_arg(
</ins><span class="cx">                         array(
</span><span class="cx">                                 $post_type_name . '-tab' =&gt; 'all',
</span><span class="cx">                                 'paged' =&gt; '%#%',
</span><span class="cx">                         )
</span><span class="cx">                 ),
</span><del>-                'format' =&gt; '', 
</del><ins>+                'format' =&gt; '',
</ins><span class="cx">                 'prev_text' =&gt; __('&amp;laquo;'),
</span><span class="cx">                 'next_text' =&gt; __('&amp;raquo;'),
</span><span class="cx">                 'total' =&gt; $num_pages,
</span><span class="cx">                 'current' =&gt; $pagenum
</span><span class="cx">         ));
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( !$posts )
</span><span class="cx">                 $error = '&lt;li id=&quot;error&quot;&gt;'. sprintf( __( 'No %s exists' ), $post_type['args']-&gt;label ) .'&lt;/li&gt;';
</span><span class="cx"> 
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $removed_args = array(
</span><del>-                'action', 
</del><ins>+                'action',
</ins><span class="cx">                 'customlink-tab',
</span><span class="cx">                 'edit-menu-item',
</span><span class="cx">                 'menu-item',
</span><span class="lines">@@ -569,10 +569,10 @@
</span><span class="cx">                         &lt;li &lt;?php echo ( 'search' == $current_tab ? ' class=&quot;tabs&quot;' : '' ); ?&gt;&gt;&lt;a class=&quot;nav-tab-link&quot; href=&quot;&lt;?php echo add_query_arg($post_type_name . '-tab', 'search', remove_query_arg($removed_args)); ?&gt;#tabs-panel-posttype-&lt;?php echo $post_type_name; ?&gt;-search&quot;&gt;&lt;?php _e('Search'); ?&gt;&lt;/a&gt;&lt;/li&gt;
</span><span class="cx">                 &lt;/ul&gt;
</span><span class="cx"> 
</span><del>-                &lt;div class=&quot;tabs-panel &lt;?php 
</del><ins>+                &lt;div class=&quot;tabs-panel &lt;?php
</ins><span class="cx">                         echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
</span><span class="cx">                 ?&gt;&quot; id=&quot;tabs-panel-posttype-&lt;?php echo $post_type_name; ?&gt;-search&quot;&gt;
</span><del>-                        &lt;?php 
</del><ins>+                        &lt;?php
</ins><span class="cx">                         if ( isset( $_REQUEST['quick-search-posttype-' . $post_type_name] ) ) {
</span><span class="cx">                                 $searched = esc_attr( $_REQUEST['quick-search-posttype-' . $post_type_name] );
</span><span class="cx">                                 $search_results = get_posts( array( 's' =&gt; $searched, 'post_type' =&gt; $post_type_name, 'fields' =&gt; 'all', 'order' =&gt; 'DESC', ) );
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> 
</span><span class="cx">                                 if ( 'all' == $current_tab &amp;&amp; ! empty( $_REQUEST['selectall'] ) ) {
</span><span class="cx">                                         $checkbox_items = preg_replace('/(type=(.)checkbox(\2))/', '$1 checked=$2checked$2', $checkbox_items);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                 }
</span><span class="cx">                                 echo $checkbox_items;
</span><span class="cx">                                 ?&gt;
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> 
</span><span class="cx">                 &lt;p class=&quot;button-controls&quot;&gt;
</span><span class="cx">                         &lt;span class=&quot;list-controls&quot;&gt;
</span><del>-                                &lt;a href=&quot;&lt;?php 
</del><ins>+                                &lt;a href=&quot;&lt;?php
</ins><span class="cx">                                         echo add_query_arg(
</span><span class="cx">                                                 array(
</span><span class="cx">                                                         $post_type_name . '-tab' =&gt; 'all',
</span><span class="lines">@@ -669,35 +669,35 @@
</span><span class="cx">         $offset = 0 &lt; $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="cx"> 
</span><span class="cx">         $args = array(
</span><del>-                'child_of' =&gt; 0, 
</del><ins>+                'child_of' =&gt; 0,
</ins><span class="cx">                 'exclude' =&gt; '',
</span><del>-                'hide_empty' =&gt; false, 
-                'hierarchical' =&gt; 1, 
-                'include' =&gt; '', 
-                'include_last_update_time' =&gt; false, 
-                'number' =&gt; $per_page, 
</del><ins>+                'hide_empty' =&gt; false,
+                'hierarchical' =&gt; 1,
+                'include' =&gt; '',
+                'include_last_update_time' =&gt; false,
+                'number' =&gt; $per_page,
</ins><span class="cx">                 'offset' =&gt; $offset,
</span><span class="cx">                 'order' =&gt; 'ASC',
</span><del>-                'orderby' =&gt; 'name', 
</del><ins>+                'orderby' =&gt; 'name',
</ins><span class="cx">                 'pad_counts' =&gt; false,
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="cx">         $num_pages = ceil( $term_count / $per_page );
</span><span class="cx"> 
</span><span class="cx">         $page_links = paginate_links( array(
</span><del>-                'base' =&gt; add_query_arg( 
</del><ins>+                'base' =&gt; add_query_arg(
</ins><span class="cx">                         array(
</span><span class="cx">                                 $taxonomy_name . '-tab' =&gt; 'all',
</span><span class="cx">                                 'paged' =&gt; '%#%',
</span><span class="cx">                         )
</span><span class="cx">                 ),
</span><del>-                'format' =&gt; '', 
</del><ins>+                'format' =&gt; '',
</ins><span class="cx">                 'prev_text' =&gt; __('&amp;laquo;'),
</span><span class="cx">                 'next_text' =&gt; __('&amp;raquo;'),
</span><span class="cx">                 'total' =&gt; $num_pages,
</span><span class="cx">                 'current' =&gt; $pagenum
</span><span class="cx">         ));
</span><del>-        
</del><ins>+
</ins><span class="cx">         $walker = new Walker_Nav_Menu_Checklist;
</span><span class="cx">         // @todo transient caching of these results with proper invalidation on updating of a tax of this type
</span><span class="cx">         $terms = get_terms( $taxonomy_name, $args );
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $removed_args = array(
</span><del>-                'action', 
</del><ins>+                'action',
</ins><span class="cx">                 'customlink-tab',
</span><span class="cx">                 'edit-menu-item',
</span><span class="cx">                 'menu-item',
</span><span class="lines">@@ -740,15 +740,15 @@
</span><span class="cx">                                 $args['walker'] = $walker;
</span><span class="cx">                                 echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $popular_terms), 0, (object) $args );
</span><span class="cx">                                 ?&gt;
</span><del>-                                &lt;?php 
</del><ins>+                                &lt;?php
</ins><span class="cx">                                 ?&gt;
</span><span class="cx">                         &lt;/ul&gt;
</span><span class="cx">                 &lt;/div&gt;&lt;!-- /.tabs-panel --&gt;
</span><span class="cx"> 
</span><del>-                &lt;div class=&quot;tabs-panel &lt;?php 
</del><ins>+                &lt;div class=&quot;tabs-panel &lt;?php
</ins><span class="cx">                         echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' );
</span><span class="cx">                 ?&gt;&quot; id=&quot;tabs-panel-search-taxonomy-&lt;?php echo $taxonomy_name; ?&gt;&quot;&gt;
</span><del>-                        &lt;?php 
</del><ins>+                        &lt;?php
</ins><span class="cx">                         if ( isset( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] ) ) {
</span><span class="cx">                                 $searched = esc_attr( $_REQUEST['quick-search-taxonomy-' . $taxonomy_name] );
</span><span class="cx">                                 $search_results = get_terms( $taxonomy_name, array( 'name__like' =&gt; $searched, 'fields' =&gt; 'all', 'orderby' =&gt; 'count', 'order' =&gt; 'DESC', 'hierarchical' =&gt; false ) );
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx">                                 &lt;input type=&quot;text&quot; class=&quot;quick-search regular-text&quot; value=&quot;&lt;?php echo $searched; ?&gt;&quot; name=&quot;quick-search-taxonomy-&lt;?php echo $taxonomy_name; ?&gt;&quot; /&gt;
</span><span class="cx">                                 &lt;input type=&quot;submit&quot; class=&quot;quick-search-submit button-secondary&quot; value=&quot;&lt;?php esc_attr_e('Search'); ?&gt;&quot; /&gt;
</span><span class="cx">                         &lt;/p&gt;
</span><del>-                
</del><ins>+
</ins><span class="cx">                         &lt;ul id=&quot;&lt;?php echo $taxonomy_name; ?&gt;-search-checklist&quot; class=&quot;list:&lt;?php echo $taxonomy_name?&gt; categorychecklist form-no-clear&quot;&gt;
</span><span class="cx">                         &lt;?php if ( ! empty( $search_results ) &amp;&amp; ! is_wp_error( $search_results ) ) : ?&gt;
</span><span class="cx">                                 &lt;?php
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx"> 
</span><span class="cx">                 &lt;p class=&quot;button-controls&quot;&gt;
</span><span class="cx">                         &lt;span class=&quot;list-controls&quot;&gt;
</span><del>-                                &lt;a href=&quot;&lt;?php 
</del><ins>+                                &lt;a href=&quot;&lt;?php
</ins><span class="cx">                                         echo add_query_arg(
</span><span class="cx">                                                 array(
</span><span class="cx">                                                         $taxonomy_name . '-tab' =&gt; 'all',
</span><span class="lines">@@ -834,12 +834,12 @@
</span><span class="cx"> 
</span><span class="cx">                 // Loop through all the menu items' POST values
</span><span class="cx">                 foreach( (array) $menu_data as $_possible_db_id =&gt; $_item_object_data ) {
</span><del>-                        if ( 
</del><ins>+                        if (
</ins><span class="cx">                                 empty( $_item_object_data['menu-item-object-id'] ) &amp;&amp; // checkbox is not checked
</span><del>-                                ( 
-                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set 
</del><ins>+                                (
+                                        ! isset( $_item_object_data['menu-item-type'] ) || // and item type either isn't set
</ins><span class="cx">                                         in_array( $_item_object_data['menu-item-url'], array( 'http://', '' ) ) || // or URL is the default
</span><del>-                                        'custom' != $_item_object_data['menu-item-type'] ||  // or it's not a custom menu item        
</del><ins>+                                        'custom' != $_item_object_data['menu-item-type'] ||  // or it's not a custom menu item
</ins><span class="cx">                                         ! empty( $_item_object_data['menu-item-db-id'] ) // or it *is* a custom menu item that already exists
</span><span class="cx">                                 )
</span><span class="cx">                         ) {
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                         // if this possible menu item doesn't actually have a menu database ID yet
</span><del>-                        if ( 
</del><ins>+                        if (
</ins><span class="cx">                                 empty( $_item_object_data['menu-item-db-id'] ) ||
</span><span class="cx">                                 ( 0 &gt; $_possible_db_id ) ||
</span><span class="cx">                                 $_possible_db_id != $_item_object_data['menu-item-db-id']
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">                         } else {
</span><span class="cx">                                 $_actual_db_id = (int) $_item_object_data['menu-item-db-id'];
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $args = array(
</span><span class="cx">                                 'menu-item-db-id' =&gt; ( isset( $_item_object_data['menu-item-db-id'] ) ? $_item_object_data['menu-item-db-id'] : '' ),
</span><span class="cx">                                 'menu-item-object-id' =&gt; ( isset( $_item_object_data['menu-item-object-id'] ) ? $_item_object_data['menu-item-object-id'] : '' ),
</span><span class="lines">@@ -885,7 +885,7 @@
</span><span class="cx">  * Adds custom arguments to some of the meta box object types.
</span><span class="cx">  *
</span><span class="cx">  * @since 3.0.0
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @access private
</span><span class="cx">  *
</span><span class="cx">  * @param object $object The post type or taxonomy meta-object.
</span><span class="lines">@@ -896,7 +896,7 @@
</span><span class="cx">                 // don't show media meta box
</span><span class="cx">                 if ( 'attachment' == $object-&gt;name )
</span><span class="cx">                         return false;
</span><del>-        
</del><ins>+
</ins><span class="cx">                 // pages should show most recent
</span><span class="cx">                 if ( 'page' == $object-&gt;name ) {
</span><span class="cx">                         $object-&gt;_default_query = array(
</span><span class="lines">@@ -919,7 +919,7 @@
</span><span class="cx">                         );
</span><span class="cx">                 }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         return $object;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -933,16 +933,16 @@
</span><span class="cx">  */
</span><span class="cx"> function wp_get_nav_menu_to_edit( $menu_item_id = 0 ) {
</span><span class="cx">         $menu = wp_get_nav_menu_object( $menu_item_id );
</span><del>-        
</del><ins>+
</ins><span class="cx">         // If the menu exists, get its items.
</span><span class="cx">         if ( is_nav_menu( $menu ) ) {
</span><span class="cx">                 $menu_items = wp_get_nav_menu_items( $menu-&gt;term_id, array('post_status' =&gt; 'any') );
</span><span class="cx"> 
</span><del>-                $walker = new Walker_Nav_Menu_Edit; 
</del><ins>+                $walker = new Walker_Nav_Menu_Edit;
</ins><span class="cx"> 
</span><span class="cx">                 return walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $menu_items), 0, (object) array('walker' =&gt; $walker ) );
</span><span class="cx">         } elseif ( is_wp_error( $menu ) ) {
</span><del>-                return $menu;        
</del><ins>+                return $menu;
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/post.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1198,7 +1198,7 @@
</span><span class="cx"> 
</span><span class="cx">         $now = time();
</span><span class="cx"> 
</span><del>-        update_post_meta( $post-&gt;ID, '_edit_lock', $now );        
</del><ins>+        update_post_meta( $post-&gt;ID, '_edit_lock', $now );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/template.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php
</span><span class="cx"> 
</span><del>-if ( post_type_supports( $screen-&gt;post_type, 'title' ) ) : 
</del><ins>+if ( post_type_supports( $screen-&gt;post_type, 'title' ) ) :
</ins><span class="cx">         if ( $bulk ) : ?&gt;
</span><span class="cx">                 &lt;div id=&quot;bulk-title-div&quot;&gt;
</span><span class="cx">                         &lt;div id=&quot;bulk-titles&quot;&gt;&lt;/div&gt;
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx">                         &lt;/select&gt;
</span><span class="cx">                 &lt;/label&gt;
</span><span class="cx"> 
</span><del>-&lt;?php 
</del><ins>+&lt;?php
</ins><span class="cx">         endif; // post_type_supports page-attributes
</span><span class="cx"> endif; // $post_type_object-&gt;hierarchical ?&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/includes/theme.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -210,30 +210,30 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Check the current theme for reliance on deprecated theme compatibility
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * Check to see if the current theme has all the required templates available
</span><span class="cx">  * from itself or its parent
</span><del>- 
</del><ins>+
</ins><span class="cx">  * @since 3.0
</span><span class="cx">  * @access private
</span><span class="cx">  * @return nothing
</span><span class="cx">  */
</span><span class="cx"> function _check_theme_deprecated_files() {
</span><span class="cx">         $files = array( );
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( ! locate_template( array( 'header.php' ) ) )
</span><span class="cx">                 $files[] = 'header.php';
</span><span class="cx">         if ( ! locate_template( array( 'footer.php' ) ) )
</span><span class="cx">                 $files[] = 'footer.php';
</span><span class="cx">         if ( ! locate_template( array( 'sidebar.php' ) ) )
</span><span class="cx">                 $files[] = 'sidebar.php';
</span><del>-        
-        // Only notify if both are missing as you can use one or the other        
</del><ins>+
+        // Only notify if both are missing as you can use one or the other
</ins><span class="cx">         if ( ! locate_template( array( 'comments.php' ) ) &amp;&amp; ! locate_template( array( 'comments-popup.php' ) ) ) {
</span><span class="cx">                 $files[] = 'comments.php';
</span><span class="cx">                 $files[] = 'comments-popup.php';
</span><del>-        }        
-                
</del><ins>+        }
+
</ins><span class="cx">         if ( ! empty( $files ) ) : ?&gt;
</span><span class="cx">                 &lt;div id=&quot;deprecated-files-message&quot; class=&quot;error&quot;&gt;&lt;p&gt;
</span><span class="cx">                         &lt;?php echo sprintf( __('The current theme is incomplete as it is missing %1$s. Please update your theme to include these files as you are currently relying on deprecated behaviour.'), implode( $files, ', ') ); ?&gt;
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/js/common.dev.js        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -144,19 +144,19 @@
</span><span class="cx">                         page: pagenow
</span><span class="cx">                 });
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         checked : function(column) {
</span><span class="cx">                 $('.column-' + column).show();
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         unchecked : function(column) {
</span><span class="cx">                 $('.column-' + column).hide();
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         hidden : function() {
</span><span class="cx">                 return $('.manage-column').filter(':hidden').map(function() { return this.id; }).get().join(',');
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         useCheckboxesForHidden : function() {
</span><span class="cx">                 this.hidden = function(){
</span><span class="cx">                         return $('.hide-column-tog').not(':checked').map(function() {
</span></span></pre></div>
<a id="trunkwpadminjscustombackgrounddevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/custom-background.dev.js (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/custom-background.dev.js        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/js/custom-background.dev.js        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">         jQuery('select[name=&quot;background-repeat&quot;]').change(function() {
</span><span class="cx">                 jQuery('#custom-background-image').css('background-repeat', jQuery(this).val());
</span><span class="cx">         });
</span><del>-        
</del><ins>+
</ins><span class="cx">         farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) {
</span><span class="cx">                 pickColor(color);
</span><span class="cx">         });
</span></span></pre></div>
<a id="trunkwpadminjsnavmenudevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/nav-menu.dev.js (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/js/nav-menu.dev.js        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> 
</span><span class="cx"> var WPNavMenuHandler = function ($) {
</span><span class="cx">         var autoCompleteData = {},
</span><del>-        
</del><ins>+
</ins><span class="cx">         menuItemDepthPerLevel = 30, // Do not use directly. Use depthToPx and pxToDepth instead.
</span><span class="cx">         globalMaxDepth = 11,
</span><span class="cx"> 
</span><span class="lines">@@ -32,9 +32,9 @@
</span><span class="cx">                                 return data.post_title;
</span><span class="cx">                 }
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         getListDataFromID = function(menuItemID, parentEl) {
</span><del>-                if ( ! menuItemID ) 
</del><ins>+                if ( ! menuItemID )
</ins><span class="cx">                         return false;
</span><span class="cx">                 parentEl = parentEl || document;
</span><span class="cx">                 var fields = [
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx">                 while ( i-- ) {
</span><span class="cx">                         j = fields.length;
</span><span class="cx">                         while ( j-- ) {
</span><del>-                                if ( 
</del><ins>+                                if (
</ins><span class="cx">                                         inputs[i] &amp;&amp;
</span><span class="cx">                                         inputs[i].name &amp;&amp;
</span><del>-                                        'menu-item[' + menuItemID + '][' + fields[j] + ']' == inputs[i].name 
</del><ins>+                                        'menu-item[' + menuItemID + '][' + fields[j] + ']' == inputs[i].name
</ins><span class="cx">                                 ) {
</span><span class="cx">                                         itemData[fields[j]] = inputs[i].value;
</span><span class="cx">                                 }
</span><span class="lines">@@ -74,21 +74,21 @@
</span><span class="cx"> 
</span><span class="cx">                 return itemData;
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         recalculateMenuItemPositions = function() {
</span><span class="cx">                 menuList.find('.menu-item-data-position').val( function(index) { return index + 1; } );
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         depthToPx = function(depth) {
</span><span class="cx">                 return depth * menuItemDepthPerLevel;
</span><span class="cx">         },
</span><del>-        
</del><ins>+
</ins><span class="cx">         pxToDepth = function(px) {
</span><span class="cx">                 return Math.floor(px / menuItemDepthPerLevel);
</span><span class="cx">         },
</span><span class="cx"> 
</span><span class="cx">         menuList;
</span><del>-        
</del><ins>+
</ins><span class="cx">         // jQuery extensions
</span><span class="cx">         $.fn.extend({
</span><span class="cx">                 menuItemDepth : function() {
</span><span class="lines">@@ -149,29 +149,29 @@
</span><span class="cx">         });
</span><span class="cx"> 
</span><span class="cx">         return {
</span><del>-                
</del><ins>+
</ins><span class="cx">                 // Functions that run on init.
</span><span class="cx">                 init : function() {
</span><span class="cx">                         menuList = $('#menu-to-edit');
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         this.attachMenuEditListeners();
</span><span class="cx"> 
</span><span class="cx">                         this.attachMenuMetaListeners(document.getElementById('nav-menu-meta'));
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         this.attachTabsPanelListeners();
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if( menuList.length ) // If no menu, we're in the + tab.
</span><span class="cx">                                 this.initSortables();
</span><span class="cx"> 
</span><span class="cx">                         this.initToggles();
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         this.initTabManager();
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 initToggles : function() {
</span><span class="cx">                         // init postboxes
</span><span class="cx">                         postboxes.add_postbox_toggles('nav-menus');
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // adjust columns functions for menus UI
</span><span class="cx">                         columns.useCheckboxesForHidden();
</span><span class="cx">                         columns.checked = function(field) {
</span><span class="lines">@@ -183,22 +183,22 @@
</span><span class="cx">                         // hide fields
</span><span class="cx">                         menuList.hideAdvancedMenuItemFields();
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 initSortables : function() {
</span><span class="cx">                         var currentDepth = 0, originalDepth, minDepth, maxDepth,
</span><span class="cx">                                 menuLeft = menuList.offset().left;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         menuList.sortable({
</span><span class="cx">                                 handle: ' &gt; dl',
</span><span class="cx">                                 placeholder: 'sortable-placeholder',
</span><span class="cx">                                 start: function(e, ui) {
</span><span class="cx">                                         var next, height, width, parent, children, maxChildDepth,
</span><span class="cx">                                                 transport = ui.item.children('.menu-item-transport');
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Set depths
</span><span class="cx">                                         originalDepth = ui.item.menuItemDepth();
</span><span class="cx">                                         updateCurrentDepth(ui, originalDepth);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Attach child elements to parent
</span><span class="cx">                                         // Skip the placeholder
</span><span class="cx">                                         parent = ( ui.item.next()[0] == ui.placeholder[0] ) ? ui.item.next() : ui.item;
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> 
</span><span class="cx">                                         // Now that the element is complete, we can update...
</span><span class="cx">                                         updateDepthRange(ui);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Update the height of the placeholder to match the moving item.
</span><span class="cx">                                         height = transport.outerHeight();
</span><span class="cx">                                         // If there are children, account for distance between top of children and parent
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">                                         height += ui.item.outerHeight();
</span><span class="cx">                                         height -= 2; // Subtract 2 for borders
</span><span class="cx">                                         ui.placeholder.height(height);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Update the width of the placeholder to match the moving item.
</span><span class="cx">                                         maxChildDepth = originalDepth;
</span><span class="cx">                                         children.each(function(){
</span><span class="lines">@@ -229,10 +229,10 @@
</span><span class="cx">                                 },
</span><span class="cx">                                 stop: function(e, ui) {
</span><span class="cx">                                         var children, depthChange = currentDepth - originalDepth;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Return child elements to the list
</span><span class="cx">                                         children = ui.item.children('.menu-item-transport').children().insertAfter(ui.item);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         // Update depth classes
</span><span class="cx">                                         if( depthChange != 0 ) {
</span><span class="cx">                                                 ui.item.updateDepthClass( currentDepth );
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">                                         // Otherwise fix it, or we're in trouble.
</span><span class="cx">                                         if( ! ui.placeholder.parent().hasClass('menu') )
</span><span class="cx">                                                 ui.placeholder.appendTo(menuList);
</span><del>-                                                
</del><ins>+
</ins><span class="cx">                                         updateDepthRange(ui);
</span><span class="cx">                                 },
</span><span class="cx">                                 sort: function(e, ui) {
</span><span class="lines">@@ -255,34 +255,34 @@
</span><span class="cx">                                         // Check and correct if depth is not within range.
</span><span class="cx">                                         if ( depth &lt; minDepth ) depth = minDepth;
</span><span class="cx">                                         else if ( depth &gt; maxDepth ) depth = maxDepth;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         if( depth != currentDepth )
</span><span class="cx">                                                 updateCurrentDepth(ui, depth);
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         function updateDepthRange(ui) {
</span><span class="cx">                                 var prev = ui.placeholder.prev(),
</span><span class="cx">                                         next = ui.placeholder.next(), depth;
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                 // Make sure we don't select the moving item.
</span><del>-                                if( prev[0] == ui.item[0] ) prev = prev.prev();        
</del><ins>+                                if( prev[0] == ui.item[0] ) prev = prev.prev();
</ins><span class="cx">                                 if( next[0] == ui.item[0] ) next = next.next();
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 minDepth = (next.length) ? next.menuItemDepth() : 0;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 if( prev.length )
</span><span class="cx">                                         maxDepth = ( (depth = prev.menuItemDepth() + 1) &gt; globalMaxDepth ) ? globalMaxDepth : depth;
</span><span class="cx">                                 else
</span><span class="cx">                                         maxDepth = 0;
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         function updateCurrentDepth(ui, depth) {
</span><span class="cx">                                 ui.placeholder.updateDepthClass( depth, currentDepth );
</span><span class="cx">                                 currentDepth = depth;
</span><span class="cx">                         }
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 attachMenuEditListeners : function() {
</span><span class="cx">                         var that = this;
</span><span class="cx">                         $('#update-nav-menu').bind('click', function(e) {
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 /**
</span><span class="cx">                  * An interface for managing default values for input elements
</span><span class="cx">                  * that is both JS and accessibility-friendly.
</span><span class="lines">@@ -309,11 +309,11 @@
</span><span class="cx">                  */
</span><span class="cx">                 setupInputWithDefaultTitle : function() {
</span><span class="cx">                         var name = 'input-with-default-title';
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $('.' + name).each( function(){
</span><span class="cx">                                 var $t = $(this), title = $t.attr('title'), val = $t.val();
</span><span class="cx">                                 $t.data( name, title );
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 if( '' == val ) $t.val( title );
</span><span class="cx">                                 else if ( title == val ) return;
</span><span class="cx">                                 else $t.removeClass( name );
</span><span class="lines">@@ -334,17 +334,17 @@
</span><span class="cx"> 
</span><span class="cx">                         var that = this;
</span><span class="cx">                         this.setupInputWithDefaultTitle();
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // auto-suggest for the quick-search boxes
</span><span class="cx">                         $('input.quick-search').each(function(i, el) {
</span><del>-                                that.setupQuickSearchEventListeners(el); 
</del><ins>+                                that.setupQuickSearchEventListeners(el);
</ins><span class="cx">                         });
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $(formEL).bind('submit', function(e) {
</span><span class="cx">                                 return that.eventSubmitMetaForm.call(that, this, e);
</span><span class="cx">                         });
</span><del>-                        $(formEL).find('input:submit').click(function() { 
-                                $(this).siblings('img.waiting').show(); 
</del><ins>+                        $(formEL).find('input:submit').click(function() {
+                                $(this).siblings('img.waiting').show();
</ins><span class="cx">                         });
</span><span class="cx">                 },
</span><span class="cx"> 
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx">                                         i = inputs.length;
</span><span class="cx"> 
</span><span class="cx">                                         // upon changing tabs, we want to uncheck all checkboxes
</span><del>-                                        while( i-- ) 
</del><ins>+                                        while( i-- )
</ins><span class="cx">                                                 inputs[i].checked = false;
</span><span class="cx"> 
</span><span class="cx">                                         $('.tabs-panel', wrapper).each(function() {
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">                                                         activePanel.className = activePanel.className.replace('tabs-panel-inactive', 'tabs-panel-active');
</span><span class="cx">                                                 }
</span><span class="cx">                                         }
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         return false;
</span><span class="cx">                                 } else if ( e.target &amp;&amp; e.target.className &amp;&amp; -1 != e.target.className.indexOf('select-all') ) {
</span><span class="cx">                                         var selectAreaMatch = /#(.*)$/.exec(e.target.href);
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 initTabManager : function() {
</span><span class="cx">                         var fixed = $('.nav-tabs-wrapper'),
</span><span class="cx">                                 fluid = fixed.children('.nav-tabs'),
</span><span class="lines">@@ -400,13 +400,13 @@
</span><span class="cx">                                 fixedRight, fixedLeft,
</span><span class="cx">                                 arrowLeft, arrowRight
</span><span class="cx">                                 resizing = false;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         function resetMenuTabs() {
</span><span class="cx">                                 fixedLeft = fixed.offset().left;
</span><span class="cx">                                 fixedRight = fixedLeft + fixed.width();
</span><span class="cx">                                 active.makeTabVisible();
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $.fn.extend({
</span><span class="cx">                                 makeTabVisible : function() {
</span><span class="cx">                                         var t = this.eq(0), left, right;
</span><span class="lines">@@ -426,43 +426,43 @@
</span><span class="cx">                                         return ( right &lt;= fixedRight &amp;&amp; left &gt;= fixedLeft ) ? true : false;
</span><span class="cx">                                 }
</span><span class="cx">                         });
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Find the width of all tabs
</span><span class="cx">                         tabs.each(function(){
</span><span class="cx">                                 tabsWidth += $(this).outerWidth(true);
</span><span class="cx">                         });
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Check if we need the tab manager
</span><span class="cx">                         if( tabsWidth &lt;= fixed.width()
</span><span class="cx">                                 - fluid.css('padding-left').slice(0,-2)
</span><span class="cx">                                 - fluid.css('padding-right').slice(0,-2) )
</span><span class="cx">                                 return;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Set up right margin for overflow, unset padding
</span><span class="cx">                         fluid.css({
</span><span class="cx">                                 'margin-right'  : (-1 * tabsWidth) + 'px',
</span><span class="cx">                                 'padding' : 0,
</span><span class="cx">                         });
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Build tab navigation
</span><span class="cx">                         arrowLeft = $('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-left&quot;&gt;&lt;a&gt;&amp;laquo;&lt;/a&gt;&lt;/div&gt;');
</span><span class="cx">                         arrowRight = $('&lt;div class=&quot;nav-tabs-arrow nav-tabs-arrow-right&quot;&gt;&lt;a&gt;&amp;raquo;&lt;/a&gt;&lt;/div&gt;');
</span><span class="cx">                         // Attach to the document
</span><span class="cx">                         fixed.wrap('&lt;div class=&quot;nav-tabs-nav&quot;/&gt;').parent().prepend( arrowLeft ).append( arrowRight );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         // Set the menu tabs
</span><span class="cx">                         resetMenuTabs();
</span><span class="cx">                         // Make sure the tabs reset on resize
</span><span class="cx">                         $(window).resize(function() {
</span><span class="cx">                                 if( resizing ) return;
</span><span class="cx">                                 resizing = true;
</span><del>-                                setTimeout(function(){ 
</del><ins>+                                setTimeout(function(){
</ins><span class="cx">                                         resetMenuTabs();
</span><span class="cx">                                         resizing = false;
</span><span class="cx">                                 }, 1000);
</span><span class="cx">                         });
</span><del>-                        
-                        // Build arrow functions                        
</del><ins>+
+                        // Build arrow functions
</ins><span class="cx">                         $.each([{
</span><span class="cx">                                         arrow : arrowLeft,
</span><span class="cx">                                         next : &quot;next&quot;,
</span><span class="lines">@@ -501,23 +501,23 @@
</span><span class="cx">                  */
</span><span class="cx">                 setupQuickSearchEventListeners : function(el) {
</span><span class="cx">                         var that = this;
</span><del>-                        $(el).autocomplete( ajaxurl + '?action=menu-quick-search&amp;type=' + el.name, 
-                                { 
-                                        delay: 500, 
</del><ins>+                        $(el).autocomplete( ajaxurl + '?action=menu-quick-search&amp;type=' + el.name,
+                                {
+                                        delay: 500,
</ins><span class="cx">                                         formatItem: formatAutocompleteResponse,
</span><span class="cx">                                         formatResult: formatAutocompleteResult,
</span><del>-                                        minchars: 2, 
-                                        multiple: false 
</del><ins>+                                        minchars: 2,
+                                        multiple: false
</ins><span class="cx">                                 }
</span><span class="cx">                         ).bind('blur', function(e) {
</span><span class="cx">                                 var changedData = autoCompleteData[this.value],
</span><span class="cx">                                 inputEl = this;
</span><span class="cx">                                 if ( changedData ) {
</span><del>-                                        $.post( 
</del><ins>+                                        $.post(
</ins><span class="cx">                                                 ajaxurl + '?action=menu-quick-search&amp;type=get-post-item&amp;response-format=markup',
</span><span class="cx">                                                 changedData,
</span><span class="cx">                                                 function(r) {
</span><del>-                                                        that.processQuickSearchQueryResponse.call(that, r, changedData); 
</del><ins>+                                                        that.processQuickSearchQueryResponse.call(that, r, changedData);
</ins><span class="cx">                                                         autoCompleteData[inputEl.value] = false;
</span><span class="cx">                                                 }
</span><span class="cx">                                         );
</span><span class="lines">@@ -546,12 +546,12 @@
</span><span class="cx">                                 }
</span><span class="cx">                         }
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 eventOnClickCloseLink : function(clickedEl) {
</span><span class="cx">                         $(clickedEl).closest('.menu-item-settings').siblings('dl').find('.item-edit').click();
</span><span class="cx">                         return false;
</span><span class="cx">                 },
</span><del>-                
</del><ins>+
</ins><span class="cx">                 eventOnClickMenuDelete : function(clickedEl) {
</span><span class="cx">                         // Delete warning AYS
</span><span class="cx">                         if ( confirm( navMenuL10n.warnDeleteMenu ) ) {
</span><span class="lines">@@ -570,7 +570,7 @@
</span><span class="cx">                         if ( confirm( navMenuL10n.warnDeleteMenuItem ) ) {
</span><span class="cx">                                 matchedSection = /_wpnonce=([a-zA-Z0-9]*)$/.exec(clickedEl.href);
</span><span class="cx">                                 if ( matchedSection &amp;&amp; matchedSection[1] ) {
</span><del>-                                        itemID = parseInt(clickedEl.id.replace('delete-', ''), 10);        
</del><ins>+                                        itemID = parseInt(clickedEl.id.replace('delete-', ''), 10);
</ins><span class="cx">                                         $.post(
</span><span class="cx">                                                 ajaxurl,
</span><span class="cx">                                                 {
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx">                                                                 that.removeMenuItem(document.getElementById('menu-item-' + itemID));
</span><span class="cx">                                                 }
</span><span class="cx">                                         );
</span><del>-                                        return false;        
</del><ins>+                                        return false;
</ins><span class="cx">                                 }
</span><span class="cx">                                 return true;
</span><span class="cx">                         } else {
</span><span class="lines">@@ -629,7 +629,7 @@
</span><span class="cx">                                         listItemDBIDMatch = re.exec(inputs[i].name);
</span><span class="cx">                                         listItemDBID = 'undefined' == typeof listItemDBIDMatch[1] ? 0 : parseInt(listItemDBIDMatch[1], 10);
</span><span class="cx">                                         listItemData = getListDataFromID(listItemDBID);
</span><del>-                                        
</del><ins>+
</ins><span class="cx">                                         for ( j in listItemData ) {
</span><span class="cx">                                                 params['menu-item[' + listItemDBID + '][' + j + ']'] = listItemData[j];
</span><span class="cx">                                         }
</span><span class="lines">@@ -654,7 +654,7 @@
</span><span class="cx">                         params['menu-settings-column-nonce'] = thisForm.elements['menu-settings-column-nonce'].value;
</span><span class="cx"> 
</span><span class="cx">                         $.post( ajaxurl, params, function(menuMarkup) {
</span><del>-                                processMethod.call(that, menuMarkup, params);        
</del><ins>+                                processMethod.call(that, menuMarkup, params);
</ins><span class="cx">                                 $(thisForm).find('img.waiting').hide();
</span><span class="cx">                         });
</span><span class="cx"> 
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> 
</span><span class="cx">                 /**
</span><span class="cx">                  * Process the quick search response into a search result
</span><del>-                 * 
</del><ins>+                 *
</ins><span class="cx">                  * @param string resp The server response to the query.
</span><span class="cx">                  * @param object req The request arguments.
</span><span class="cx">                  */
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                         wrap.innerHTML = resp;
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         items = wrap.getElementsByTagName('li');
</span><span class="cx"> 
</span><span class="cx">                         if ( items[0] &amp;&amp; req.object_type ) {
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx">                 removeMenuItem : function(el) {
</span><span class="cx">                         el = $(el)
</span><span class="cx">                         var children = el.childMenuItems();
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         el.addClass('deleting').fadeOut( 350 , function() {
</span><span class="cx">                                 el.remove();
</span><span class="cx">                                 children.shiftDepthClass(-1).updateParentMenuItemDBId();
</span></span></pre></div>
<a id="trunkwpadminjsthemepreviewdevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/theme-preview.dev.js (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/theme-preview.dev.js        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/js/theme-preview.dev.js        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> 
</span><span class="cx">                 $('#TB_iframeContent').width('100%');
</span><span class="cx">                 thickDims();
</span><del>-                
</del><ins>+
</ins><span class="cx">                 return false;
</span><span class="cx">         } );
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-delete-site.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-delete-site.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/ms-delete-site.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> // @todo Create a delete blog cap.
</span><span class="cx"> if ( ! current_user_can( 'manage_options' ) )
</span><span class="cx">         wp_die(__( 'You do not have sufficient permissions to delete this site.'));
</span><del>-        
</del><ins>+
</ins><span class="cx"> if ( isset( $_GET['h'] ) &amp;&amp; $_GET['h'] != '' &amp;&amp; get_option( 'delete_blog_hash' ) != false ) {
</span><span class="cx">         if ( get_option( 'delete_blog_hash' ) == $_GET['h'] ) {
</span><span class="cx">                 wpmu_delete_blog( $wpdb-&gt;blogid );
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/ms-edit.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> 
</span><span class="cx">                         if ( ! current_user_can( 'manage_sites' ) )
</span><span class="cx">                                 wp_die( __( 'You do not have permission to access this page.' ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">                         if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
</span><span class="cx">                                 $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
</span><span class="cx"> 
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx">                         nocache_headers();
</span><span class="cx">                         header( 'Content-Type: text/html; charset=utf-8' );
</span><span class="cx">                 }
</span><del>-                if ( $current_site-&gt;blog_id == $id )        
</del><ins>+                if ( $current_site-&gt;blog_id == $id )
</ins><span class="cx">                         wp_die( __( 'You are not allowed to change the current site.' ) );
</span><span class="cx">                 ?&gt;
</span><span class="cx">                 &lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;
</span><span class="lines">@@ -489,8 +489,8 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( $id != '0' &amp;&amp; $id != '1' ) {
</span><span class="cx">                         $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle with arrays
</span><del>-                        $title = __( 'Users' ); 
-                        $parent_file = 'ms-admin.php'; 
</del><ins>+                        $title = __( 'Users' );
+                        $parent_file = 'ms-admin.php';
</ins><span class="cx">                         require_once( 'admin-header.php' );
</span><span class="cx">                         echo '&lt;div class=&quot;wrap&quot;&gt;';
</span><span class="cx">                         confirm_delete_users( $_POST['allusers'] );
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx">             require_once( 'admin-footer.php' );
</span><span class="cx">             exit();
</span><span class="cx">                 } else {
</span><del>-                        wp_redirect( admin_url( 'ms-users.php' ) );        
</del><ins>+                        wp_redirect( admin_url( 'ms-users.php' ) );
</ins><span class="cx">                 }
</span><span class="cx">         break;
</span><span class="cx"> 
</span><span class="lines">@@ -516,8 +516,8 @@
</span><span class="cx">                                 if ( !empty( $val ) ) {
</span><span class="cx">                                         switch ( $doaction ) {
</span><span class="cx">                                                 case 'delete':
</span><del>-                                                        $title = __( 'Users' ); 
-                                                        $parent_file = 'ms-admin.php'; 
</del><ins>+                                                        $title = __( 'Users' );
+                                                        $parent_file = 'ms-admin.php';
</ins><span class="cx">                                                         require_once( 'admin-header.php' );
</span><span class="cx">                                                         echo '&lt;div class=&quot;wrap&quot;&gt;';
</span><span class="cx">                                                         confirm_delete_users( $_POST['allusers'] );
</span><span class="lines">@@ -543,13 +543,13 @@
</span><span class="cx">                                                 case 'notspam':
</span><span class="cx">                                                         $userfunction = 'all_notspam';
</span><span class="cx">                                                         $blogs = get_blogs_of_user( $val, true );
</span><del>-                                                        foreach ( (array) $blogs as $key =&gt; $details ) 
</del><ins>+                                                        foreach ( (array) $blogs as $key =&gt; $details )
</ins><span class="cx">                                                                 update_blog_status( $details-&gt;userblog_id, 'spam', '0' );
</span><span class="cx"> 
</span><span class="cx">                                                         update_user_status( $val, 'spam', '0', 1 );
</span><span class="cx">                                                 break;
</span><del>-                                        }                
-                                }                        
</del><ins>+                                        }
+                                }
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                         wp_redirect( add_query_arg( array( 'updated' =&gt; 'true', 'action' =&gt; $userfunction ), wp_get_referer() ) );
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx">                 if ( is_array( $_POST['user'] ) &amp;&amp; ! empty( $_POST['user'] ) )
</span><span class="cx">                         foreach( $_POST['user'] as $id ) {
</span><span class="cx">                                 wpmu_delete_user( $id );
</span><del>-                                $i++;        
</del><ins>+                                $i++;
</ins><span class="cx">                         }
</span><span class="cx"> 
</span><span class="cx">                 if ( $i == 1 )
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/ms-options.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">                                 &lt;th scope=&quot;row&quot;&gt;&lt;label for=&quot;admin_notice_feed&quot;&gt;&lt;?php _e( 'Admin Notice Feed' ) ?&gt;&lt;/label&gt;&lt;/th&gt;
</span><span class="cx">                                 &lt;td&gt;&lt;input name=&quot;admin_notice_feed&quot; class=&quot;large-text&quot; type=&quot;text&quot; id=&quot;admin_notice_feed&quot; value=&quot;&lt;?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?&gt;&quot; size=&quot;80&quot; /&gt;&lt;br /&gt;
</span><span class="cx">                                 &lt;?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?&gt;&lt;br /&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 &lt;?php if ( get_site_option( 'admin_notice_feed' ) != get_home_url( $current_site-&gt;id, 'feed/' ) )
</span><span class="cx">                                         echo __( 'A good one to use would be the feed from your main site: ' ) . esc_url( get_home_url( $current_site-&gt;id, 'feed/' ) ) ?&gt;&lt;/td&gt;
</span><span class="cx">                         &lt;/tr&gt;
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/ms-users.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">                                                         &lt;?php
</span><span class="cx">                                                         break;
</span><span class="cx"> 
</span><del>-                                                        case 'registered': 
</del><ins>+                                                        case 'registered':
</ins><span class="cx">                                                                 if ( 'list' == $mode )
</span><span class="cx">                                                                         $date = 'Y/m/d';
</span><span class="cx">                                                                 else
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx">                                                                                         if ( get_blog_status( $val-&gt;userblog_id, 'spam' ) == 1 )
</span><span class="cx">                                                                                                 echo 'style=&quot;background-color: #faa&quot; ';
</span><span class="cx">                                                                                         echo 'href=&quot;' .  esc_url( get_home_url( $val-&gt;userblog_id ) )  . '&quot;&gt;' . __( 'View' ) . '&lt;/a&gt;';
</span><del>-                                                                                        
</del><ins>+
</ins><span class="cx">                                                                                         echo '&lt;/small&gt;&lt;br /&gt;';
</span><span class="cx">                                                                                 }
</span><span class="cx">                                                                         }
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/my-sites.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">                 update_user_option( $current_user-&gt;id, 'primary_blog', (int) $_POST['primary_blog'], true );
</span><span class="cx">                 $updated = true;
</span><span class="cx">         } else {
</span><del>-                wp_die( __( 'The primary site you chose does not exist.' ) );        
</del><ins>+                wp_die( __( 'The primary site you chose does not exist.' ) );
</ins><span class="cx">         }
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/nav-menus.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -107,17 +107,17 @@
</span><span class="cx">                                                         if ( ! empty( $possible_object_id ) ) {
</span><span class="cx">                                                                 $dbids_to_objectids[$ordered_menu_item_object-&gt;ID] = $possible_object_id;
</span><span class="cx">                                                                 $objectids_to_dbids[$possible_object_id] = $ordered_menu_item_object-&gt;ID;
</span><del>-                                                        } 
</del><ins>+                                                        }
</ins><span class="cx">                                                 }
</span><span class="cx">                                         }
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">                                         // if this menu item is not first
</span><span class="cx">                                         if ( ! empty( $dbids_to_orders[$menu_item_id] ) &amp;&amp; ! empty( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) ) {
</span><del>-                                                
</del><ins>+
</ins><span class="cx">                                                 // if this menu item is a child of the previous
</span><del>-                                                if ( 
-                                                        ! empty( $menu_item_data['post_parent'] ) &amp;&amp; 
</del><ins>+                                                if (
+                                                        ! empty( $menu_item_data['post_parent'] ) &amp;&amp;
</ins><span class="cx">                                                         isset( $objectids_to_dbids[$menu_item_data['post_parent']] ) &amp;&amp;
</span><span class="cx">                                                         isset( $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] ) &amp;&amp;
</span><span class="cx">                                                         ( $objectids_to_dbids[$menu_item_data['post_parent']] == $orders_to_dbids[$dbids_to_orders[$menu_item_id] - 1] )
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx">                                                         $parent_data = get_post( $parent_db_id, ARRAY_A );
</span><span class="cx"> 
</span><span class="cx">                                                         if ( ! is_wp_error( $parent_data ) ) {
</span><del>-                                                                
</del><ins>+
</ins><span class="cx">                                                                 // if there is something before the parent, make menu item a child of the parent's parent
</span><span class="cx">                                                                 if ( ! empty( $dbids_to_orders[$parent_db_id] ) &amp;&amp; ! empty( $orders_to_dbids[$dbids_to_orders[$parent_db_id] - 1] ) ) {
</span><span class="cx">                                                                         $menu_item_data['post_parent'] = $parent_data['post_parent'];
</span><span class="lines">@@ -136,13 +136,13 @@
</span><span class="cx">                                                                 } else {
</span><span class="cx">                                                                         $menu_item_data['post_parent'] = 0;
</span><span class="cx">                                                                 }
</span><del>-                                                                
</del><ins>+
</ins><span class="cx">                                                                 // set former parent's [menu_order] to that of menu-item's
</span><span class="cx">                                                                 $parent_data['menu_order'] = $parent_data['menu_order'] + 1;
</span><span class="cx"> 
</span><span class="cx">                                                                 // set menu-item's [menu_order] to that of former parent
</span><span class="cx">                                                                 $menu_item_data['menu_order'] = $menu_item_data['menu_order'] - 1;
</span><del>-                                                                
</del><ins>+
</ins><span class="cx">                                                                 // save changes
</span><span class="cx">                                                                 wp_update_post($menu_item_data);
</span><span class="cx">                                                                 wp_update_post($parent_data);
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> 
</span><span class="cx">                 if ( is_nav_menu_item( $menu_item_id ) ) {
</span><span class="cx">                         if ( wp_delete_post( $menu_item_id, true ) ) {
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                 $messages[] = '&lt;div id=&quot;message&quot; class=&quot;updated&quot;&gt;&lt;p&gt;' . __('The menu item has been successfully deleted.') . '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> 
</span><span class="cx">                                                 $menu_item_db_id = wp_update_nav_menu_item( $nav_menu_selected_id, ( $_POST['menu-item-db-id'][$_key] != $_key ? 0 : $_key ), $args );
</span><span class="cx"> 
</span><del>-                                                if ( is_wp_error( $menu_item_db_id ) ) 
</del><ins>+                                                if ( is_wp_error( $menu_item_db_id ) )
</ins><span class="cx">                                                         $messages[] = '&lt;div id=&quot;message&quot; class=&quot;error&quot;&gt;&lt;p&gt;' . $menu_item_db_id-&gt;get_error_message() . '&lt;/p&gt;&lt;/div&gt;';
</span><span class="cx">                                                 elseif ( isset( $menu_items[$menu_item_db_id] ) )
</span><span class="cx">                                                         unset( $menu_items[$menu_item_db_id] );
</span><span class="lines">@@ -327,12 +327,12 @@
</span><span class="cx"> &lt;div class=&quot;wrap&quot;&gt;
</span><span class="cx">         &lt;?php screen_icon(); ?&gt;
</span><span class="cx">         &lt;h2&gt;&lt;?php esc_html_e('Menus'); ?&gt;&lt;/h2&gt;
</span><del>-        &lt;?php 
</del><ins>+        &lt;?php
</ins><span class="cx">         foreach( $messages as $message ) :
</span><del>-                echo $message . &quot;\n&quot;; 
</del><ins>+                echo $message . &quot;\n&quot;;
</ins><span class="cx">         endforeach;
</span><span class="cx">         ?&gt;
</span><del>-        
</del><ins>+
</ins><span class="cx">         &lt;?php if ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) : ?&gt;
</span><span class="cx">         &lt;div id=&quot;nav-menus-frame&quot;&gt;
</span><span class="cx">         &lt;div id=&quot;menu-settings-column&quot; class=&quot;metabox-holder&quot;&gt;
</span><span class="lines">@@ -364,10 +364,10 @@
</span><span class="cx">                         &lt;/div&gt;
</span><span class="cx">                         &lt;div class=&quot;nav-tabs-wrapper&quot;&gt;
</span><span class="cx">                         &lt;div class=&quot;nav-tabs&quot;&gt;
</span><del>-                                &lt;?php 
</del><ins>+                                &lt;?php
</ins><span class="cx">                                 foreach( (array) $nav_menus as $_nav_menu ) :
</span><del>-                        
-                                        ?&gt;&lt;a href=&quot;&lt;?php 
</del><ins>+
+                                        ?&gt;&lt;a href=&quot;&lt;?php
</ins><span class="cx">                                                 echo add_query_arg(
</span><span class="cx">                                                         array(
</span><span class="cx">                                                                 'action' =&gt; 'edit',
</span><span class="lines">@@ -375,14 +375,14 @@
</span><span class="cx">                                                         ),
</span><span class="cx">                                                         admin_url( 'nav-menus.php' )
</span><span class="cx">                                                 );
</span><del>-                                        ?&gt;&quot; class=&quot;nav-tab&lt;?php 
-                                                if ( $nav_menu_selected_id == $_nav_menu-&gt;term_id ) 
</del><ins>+                                        ?&gt;&quot; class=&quot;nav-tab&lt;?php
+                                                if ( $nav_menu_selected_id == $_nav_menu-&gt;term_id )
</ins><span class="cx">                                                         echo ' nav-tab-active';
</span><span class="cx">                                                 else
</span><span class="cx">                                                         echo ' hide-if-no-js';
</span><span class="cx">                                         ?&gt;&quot;&gt;&lt;?php echo esc_html( $_nav_menu-&gt;name ); ?&gt;&lt;/a&gt;&lt;?php
</span><span class="cx">                                 endforeach;
</span><del>-                                ?&gt;&lt;a href=&quot;&lt;?php 
</del><ins>+                                ?&gt;&lt;a href=&quot;&lt;?php
</ins><span class="cx">                                         echo add_query_arg(
</span><span class="cx">                                                 array(
</span><span class="cx">                                                         'action' =&gt; 'edit',
</span><span class="lines">@@ -390,8 +390,8 @@
</span><span class="cx">                                                 ),
</span><span class="cx">                                                 admin_url( 'nav-menus.php' )
</span><span class="cx">                                         );
</span><del>-                                ?&gt;&quot; class=&quot;nav-tab menu-add-new&lt;?php 
-                                        if ( 0 == $nav_menu_selected_id ) 
</del><ins>+                                ?&gt;&quot; class=&quot;nav-tab menu-add-new&lt;?php
+                                        if ( 0 == $nav_menu_selected_id )
</ins><span class="cx">                                                 echo ' nav-tab-active';
</span><span class="cx">                                 ?&gt;&quot;&gt;&lt;?php printf( '&lt;abbr title=&quot;%s&quot;&gt;+&lt;/abbr&gt;', esc_html__( 'Add menu' ) ); ?&gt;&lt;/a&gt;
</span><span class="cx">                         &lt;/div&gt;
</span><span class="lines">@@ -406,11 +406,11 @@
</span><span class="cx">                                                                         &lt;input name=&quot;menu-name&quot; type=&quot;text&quot; class=&quot;menu-name regular-text menu-item-textbox input-with-default-title&quot; title=&quot;Enter menu name here.&quot; value=&quot;&lt;?php echo esc_attr( $nav_menu_selected_title  ); ?&gt;&quot; /&gt;
</span><span class="cx">                                                                         &lt;br class=&quot;clear&quot; /&gt;
</span><span class="cx">                                                                 &lt;/label&gt;
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                                                 &lt;div class=&quot;publishing-action&quot;&gt;
</span><span class="cx">                                                                         &lt;input class=&quot;button-primary&quot; name=&quot;save_menu&quot; type=&quot;submit&quot; value=&quot;&lt;?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?&gt;&quot; /&gt;
</span><span class="cx">                                                                 &lt;/div&gt;&lt;!--END .publishing-action--&gt;
</span><del>-                                                        
</del><ins>+
</ins><span class="cx">                                                                 &lt;?php if ( ! empty( $nav_menu_selected_id ) ) : ?&gt;
</span><span class="cx">                                                                 &lt;div class=&quot;delete-action&quot;&gt;
</span><span class="cx">                                                                         &lt;a class=&quot;submitdelete deletion menu-delete&quot; href=&quot;&lt;?php echo wp_nonce_url( admin_url('nav-menus.php?action=delete&amp;amp;menu=' . $nav_menu_selected_id), 'delete-nav_menu-' . $nav_menu_selected_id ); ?&gt;&quot;&gt;&lt;?php _e('Delete Menu'); ?&gt;&lt;/a&gt;
</span><span class="lines">@@ -429,8 +429,8 @@
</span><span class="cx">                                                 &lt;div id=&quot;post-body-content&quot;&gt;
</span><span class="cx">                                                         &lt;?php if ( is_nav_menu( $nav_menu_selected_id ) &amp;&amp; ( current_theme_supports('nav-menus') || current_theme_supports('widgets') ) ) : ?&gt;
</span><span class="cx">                                                                 &lt;ul class=&quot;menu&quot; id=&quot;menu-to-edit&quot;&gt;
</span><del>-                                                                &lt;?php 
-                                                                $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  ); 
</del><ins>+                                                                &lt;?php
+                                                                $edit_markup = wp_get_nav_menu_to_edit( $nav_menu_selected_id  );
</ins><span class="cx">                                                                 if ( ! is_wp_error( $edit_markup ) ) {
</span><span class="cx">                                                                         echo $edit_markup;
</span><span class="cx">                                                                 }
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/press-this.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -486,7 +486,7 @@
</span><span class="cx">                                 &lt;h3 class=&quot;hndle&quot;&gt;&lt;?php _e('Categories') ?&gt;&lt;/h3&gt;
</span><span class="cx">                                 &lt;div class=&quot;inside&quot;&gt;
</span><span class="cx">                                 &lt;div id=&quot;taxonomy-category&quot; class=&quot;categorydiv&quot;&gt;
</span><del>-                                
</del><ins>+
</ins><span class="cx">                                         &lt;ul id=&quot;category-tabs&quot; class=&quot;category-tabs&quot;&gt;
</span><span class="cx">                                                 &lt;li class=&quot;tabs&quot;&gt;&lt;a href=&quot;#category-all&quot; tabindex=&quot;3&quot;&gt;&lt;?php printf( __( 'All %s' ), $tax-&gt;label ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</span><span class="cx">                                                 &lt;li class=&quot;hide-if-no-js&quot;&gt;&lt;a href=&quot;#category-pop&quot; tabindex=&quot;3&quot;&gt;&lt;?php _e( 'Most Used' ); ?&gt;&lt;/a&gt;&lt;/li&gt;
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-admin/setup-config.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -160,9 +160,9 @@
</span><span class="cx">         if ( empty($prefix) )
</span><span class="cx">                 $prefix = 'wp_';
</span><span class="cx"> 
</span><del>-        // Validate $prefix: it can only contain letters, numbers and underscores 
-        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) 
-                wp_die( /*WP_I18N_BAD_PREFIX*/'&lt;strong&gt;ERROR&lt;/strong&gt;: &quot;Table Prefix&quot; can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ ); 
</del><ins>+        // Validate $prefix: it can only contain letters, numbers and underscores
+        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
+                wp_die( /*WP_I18N_BAD_PREFIX*/'&lt;strong&gt;ERROR&lt;/strong&gt;: &quot;Table Prefix&quot; can only contain numbers, letters, and underscores.'/*/WP_I18N_BAD_PREFIX*/ );
</ins><span class="cx"> 
</span><span class="cx">         // Test the db connection.
</span><span class="cx">         /**#@+
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/canonical.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx">                 $id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id'));
</span><span class="cx">                 if ( $id &amp;&amp; $redirect_url = get_permalink($id) )
</span><span class="cx">                         $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
</span><del>-        
</del><ins>+
</ins><span class="cx">                 if ( ! $redirect_url )
</span><span class="cx">                         $redirect_url = redirect_guess_404_permalink();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/capabilities.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1180,9 +1180,9 @@
</span><span class="cx">  * Retrieve a list of super admins.
</span><span class="cx">  *
</span><span class="cx">  * @since 3.0.0
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @uses $super_admins Super admins global variable, if set.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @return array List of super admin logins
</span><span class="cx">  */
</span><span class="cx"> function get_super_admins() {
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/category-template.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -473,7 +473,7 @@
</span><span class="cx">                 $r['exclude_tree'] = $r['exclude'];
</span><span class="cx">                 $r['exclude'] = '';
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( !isset( $r['class'] ) )
</span><span class="cx">                 $r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/class-http.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx">          */
</span><span class="cx">         function processResponse($strResponse) {
</span><span class="cx">                 $res = explode(&quot;\r\n\r\n&quot;, $strResponse, 2);
</span><del>-                
</del><ins>+
</ins><span class="cx">                 return array('headers' =&gt; isset($res[0]) ? $res[0] : array(), 'body' =&gt; isset($res[1]) ? $res[1] : '');
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesclassoembedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-oembed.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-oembed.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/class-oembed.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx">                 $provider = add_query_arg( 'maxwidth', $args['width'], $provider );
</span><span class="cx">                 $provider = add_query_arg( 'maxheight', $args['height'], $provider );
</span><span class="cx">                 $provider = add_query_arg( 'url', urlencode($url), $provider );
</span><del>-                
</del><ins>+
</ins><span class="cx">                 foreach( array( 'json', 'xml' ) as $format ) {
</span><span class="cx">                         $result = $this-&gt;_fetch_with_format( $provider, $format );
</span><span class="cx">                         if ( is_wp_error( $result ) &amp;&amp; 'not-implemented' == $result-&gt;get_error_code() )
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/comment-template.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1257,7 +1257,7 @@
</span><span class="cx">          * display children of higher nesting levels than selected inline on
</span><span class="cx">          * the highest depth level displayed. This prevents them being orphaned
</span><span class="cx">          * at the end of the comment list.
</span><del>-         * 
</del><ins>+         *
</ins><span class="cx">          * Example: max_depth = 2, with 5 levels of nested content.
</span><span class="cx">          * 1
</span><span class="cx">          *  1.1
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/formatting.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -52,10 +52,10 @@
</span><span class="cx">                         $cockney = array(&quot;'tain't&quot;,&quot;'twere&quot;,&quot;'twas&quot;,&quot;'tis&quot;,&quot;'twill&quot;,&quot;'til&quot;,&quot;'bout&quot;,&quot;'nuff&quot;,&quot;'round&quot;,&quot;'cause&quot;);
</span><span class="cx">                         $cockneyreplace = array(&quot;&amp;#8217;tain&amp;#8217;t&quot;,&quot;&amp;#8217;twere&quot;,&quot;&amp;#8217;twas&quot;,&quot;&amp;#8217;tis&quot;,&quot;&amp;#8217;twill&quot;,&quot;&amp;#8217;til&quot;,&quot;&amp;#8217;bout&quot;,&quot;&amp;#8217;nuff&quot;,&quot;&amp;#8217;round&quot;,&quot;&amp;#8217;cause&quot;);
</span><span class="cx">                 }
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $static_characters = array_merge(array('---', ' -- ', '--', ' - ', 'xn&amp;#8211;', '...', '``', '\'\'', ' (tm)'), $cockney);
</span><span class="cx">                 $static_replacements = array_merge(array('&amp;#8212;', ' &amp;#8212; ', '&amp;#8211;', ' &amp;#8211; ', 'xn--', '&amp;#8230;', $opening_quote, $closing_quote, ' &amp;#8482;'), $cockneyreplace);
</span><del>- 
</del><ins>+
</ins><span class="cx">                 $dynamic_characters = array('/\'(\d\d(?:&amp;#8217;|\')?s)/', '/\'(\d+)/', '/(\s|\A|[([{&lt;]|&quot;)\'/', '/(\d+)&quot;/', '/(\d+)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A|[([{&lt;])&quot;(?!\s)/', '/&quot;(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/\b(\d+)x(\d+)\b/');
</span><span class="cx">                 $dynamic_replacements = array('&amp;#8217;$1','&amp;#8217;$1', '$1&amp;#8216;', '$1&amp;#8243;', '$1&amp;#8242;', '$1&amp;#8217;$2', '$1' . $opening_quote . '$2', $closing_quote . '$1', '&amp;#8217;$1', '$1&amp;#215;$2');
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/functions.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -2912,7 +2912,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @param array $list An array of objects to filter
</span><span class="cx">  * @param array $args An array of key =&gt; value arguments to match against each object
</span><del>- * @param string $operator The logical operation to perform. 'or' means only one element 
</del><ins>+ * @param string $operator The logical operation to perform. 'or' means only one element
</ins><span class="cx">  *        from the array needs to match; 'and' means all elements must match. The default is 'and'.
</span><span class="cx">  * @param bool|string $field A field from the object to place instead of the entire object
</span><span class="cx">  * @return array A list of objects or object fields
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/locale.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">                 /* translators: $thousands_sep argument for http://php.net/number_format, default is , */
</span><span class="cx">                 $trans = __('number_format_thousands_sep');
</span><span class="cx">                 $this-&gt;number_format['thousands_sep'] = ('number_format_thousands_sep' == $trans) ? ',' : $trans;
</span><del>-                
</del><ins>+
</ins><span class="cx">                 /* translators: $dec_point argument for http://php.net/number_format, default is . */
</span><span class="cx">                 $trans = __('number_format_decimal_point');
</span><span class="cx">                 $this-&gt;number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/ms-functions.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1325,7 +1325,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
</span><span class="cx">                 wp_die( sprintf(__('An error occurred adding you to this site. Back to the &lt;a href=&quot;%s&quot;&gt;homepage&lt;/a&gt;.'), site_url() ) );
</span><del>-        
</del><ins>+
</ins><span class="cx">         wp_die( sprintf(__('You have been added to this site. Please visit the &lt;a href=&quot;%s&quot;&gt;homepage&lt;/a&gt; or &lt;a href=&quot;%s&quot;&gt;login&lt;/a&gt; using your username and password.'), site_url(), admin_url() ), __('Success') );
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/nav-menu-template.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">                 $classes = ' class=&quot;' . esc_attr( $classes ) . '&quot;';
</span><span class="cx"> 
</span><span class="cx">                 $output .= $indent . '&lt;li id=&quot;menu-item-'. $item-&gt;ID . '&quot;' . $value . $classes .'&gt;';
</span><del>-                
</del><ins>+
</ins><span class="cx">                 $attributes  = ! empty( $item-&gt;attr_title ) ? ' title=&quot;'  . esc_attr( $item-&gt;attr_title ) .'&quot;' : '';
</span><span class="cx">                 $attributes .= ! empty( $item-&gt;target )     ? ' target=&quot;' . esc_attr( $item-&gt;target     ) .'&quot;' : '';
</span><span class="cx">                 $attributes .= ! empty( $item-&gt;xfn )        ? ' rel=&quot;'    . esc_attr( $item-&gt;xfn        ) .'&quot;' : '';
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">                 $item_output .= $args-&gt;link_before . apply_filters( 'the_title', $item-&gt;title ) . $args-&gt;link_after;
</span><span class="cx">                 $item_output .= '&lt;/a&gt;';
</span><span class="cx">                 $item_output .= $args-&gt;after;
</span><del>-        
</del><ins>+
</ins><span class="cx">                 $output .= apply_filters( 'wp_get_nav_menu_item', $item_output, $args );
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">                         }
</span><span class="cx">                 }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         // If the menu exists, get its items.
</span><span class="cx">         if ( $menu &amp;&amp; ! is_wp_error($menu) )
</span><span class="cx">                 $menu_items = wp_get_nav_menu_items( $menu-&gt;term_id );
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx">                         return call_user_func( $args-&gt;fallback_cb, (array) $args );
</span><span class="cx">                 }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         $nav_menu = '';
</span><span class="cx">         $items = '';
</span><span class="cx">         $container_allowedtags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'p', 'nav' ) );
</span><span class="lines">@@ -236,10 +236,10 @@
</span><span class="cx"> 
</span><span class="cx">         $items .= walk_nav_menu_tree( $sorted_menu_items, $args-&gt;depth, $args );
</span><span class="cx"> 
</span><del>-        // Attributes        
</del><ins>+        // Attributes
</ins><span class="cx">         $attributes  = ' id=&quot;menu-' . $menu-&gt;slug . '&quot;';
</span><span class="cx">         $attributes .= $args-&gt;menu_class ? ' class=&quot;'. $args-&gt;menu_class .'&quot;' : '';
</span><del>-        
</del><ins>+
</ins><span class="cx">         $nav_menu .= '&lt;ul'. $attributes .'&gt;';
</span><span class="cx"> 
</span><span class="cx">         // Allow plugins to hook into the menu to add their own &lt;li&gt;'s
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/nav-menu.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx">  * @return mixed $menu|false Or WP_Error
</span><span class="cx">  */
</span><span class="cx"> function wp_get_nav_menu_object( $menu ) {
</span><del>-        if ( ! $menu ) 
</del><ins>+        if ( ! $menu )
</ins><span class="cx">                 return false;
</span><span class="cx"> 
</span><span class="cx">         $menu_obj = get_term( $menu, 'nav_menu' );
</span><span class="lines">@@ -47,17 +47,17 @@
</span><span class="cx"> function is_nav_menu( $menu ) {
</span><span class="cx">         if ( ! $menu )
</span><span class="cx">                 return false;
</span><del>-        
</del><ins>+
</ins><span class="cx">         $menu_obj = wp_get_nav_menu_object( $menu );
</span><span class="cx"> 
</span><del>-        if ( 
-                $menu_obj &amp;&amp; 
-                ! is_wp_error( $menu_obj ) &amp;&amp; 
</del><ins>+        if (
+                $menu_obj &amp;&amp;
+                ! is_wp_error( $menu_obj ) &amp;&amp;
</ins><span class="cx">                 ! empty( $menu_obj-&gt;taxonomy ) &amp;&amp;
</span><span class="cx">                 'nav_menu' == $menu_obj-&gt;taxonomy
</span><del>-        ) 
</del><ins>+        )
</ins><span class="cx">                 return true;
</span><del>-        
</del><ins>+
</ins><span class="cx">         return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -163,22 +163,22 @@
</span><span class="cx">                 return $_menu;
</span><span class="cx"> 
</span><span class="cx">         if ( $_menu &amp;&amp; isset( $_menu-&gt;term_id ) ) {
</span><del>-                $args = array( 
-                        'description' =&gt; ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ), 
-                        'name' =&gt; ( isset( $menu_data['menu-name'] ) ? $menu_data['menu-name'] : '' ), 
-                        'parent' =&gt; ( isset( $menu_data['parent'] ) ? (int) $menu_data['parent'] : 0 ), 
-                        'slug' =&gt; null, 
</del><ins>+                $args = array(
+                        'description' =&gt; ( isset( $menu_data['description'] ) ? $menu_data['description'] : '' ),
+                        'name' =&gt; ( isset( $menu_data['menu-name'] ) ? $menu_data['menu-name'] : '' ),
+                        'parent' =&gt; ( isset( $menu_data['parent'] ) ? (int) $menu_data['parent'] : 0 ),
+                        'slug' =&gt; null,
</ins><span class="cx">                 );
</span><del>-        
</del><ins>+
</ins><span class="cx">                 $menu_id = (int) $_menu-&gt;term_id;
</span><span class="cx"> 
</span><span class="cx">                 // double-check that we're not changing a menu to the name of another
</span><del>-                $_possible_existing = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' ); 
-                if ( 
-                        $_possible_existing &amp;&amp; 
-                        ! is_wp_error( $_possible_existing ) &amp;&amp; 
</del><ins>+                $_possible_existing = get_term_by( 'name', $menu_data['menu-name'], 'nav_menu' );
+                if (
+                        $_possible_existing &amp;&amp;
+                        ! is_wp_error( $_possible_existing ) &amp;&amp;
</ins><span class="cx">                         isset( $_possible_existing-&gt;term_id ) &amp;&amp;
</span><del>-                        $_possible_existing-&gt;term_id != $menu_id 
</del><ins>+                        $_possible_existing-&gt;term_id != $menu_id
</ins><span class="cx">                 ) {
</span><span class="cx">                         return new WP_Error( 'menu_exists', sprintf( __('The menu name &lt;strong&gt;%s&lt;/strong&gt; conflicts with another menu name. Please try another.'), esc_html( $menu_data['menu-name'] ) ) );
</span><span class="cx">                 }
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">                         $args['menu-item-position'] = $count;
</span><span class="cx">                 }
</span><span class="cx">         }
</span><del>-        
</del><ins>+
</ins><span class="cx">         if ( 'custom' != $args['menu-item-type'] ) {
</span><span class="cx">                 /* if non-custom menu item, then:
</span><span class="cx">                         * use original object's URL
</span><span class="lines">@@ -297,9 +297,9 @@
</span><span class="cx">                 'ping_status' =&gt; 0,
</span><span class="cx">                 'post_content' =&gt; $args['menu-item-description'],
</span><span class="cx">                 'post_excerpt' =&gt; $args['menu-item-attr-title'],
</span><del>-                'post_parent' =&gt; $args['menu-item-parent-id'], 
-                'post_title' =&gt; $args['menu-item-title'], 
-                'post_type' =&gt; 'nav_menu_item', 
</del><ins>+                'post_parent' =&gt; $args['menu-item-parent-id'],
+                'post_title' =&gt; $args['menu-item-title'],
+                'post_type' =&gt; 'nav_menu_item',
</ins><span class="cx">                 'tax_input' =&gt; array( 'nav_menu' =&gt; $menu-&gt;name ),
</span><span class="cx">         );
</span><span class="cx"> 
</span><span class="lines">@@ -376,10 +376,10 @@
</span><span class="cx">                 $_b = (int) $b-&gt;$_menu_item_sort_prop;
</span><span class="cx"> 
</span><span class="cx">                 if ( $a-&gt;$_menu_item_sort_prop == $b-&gt;$_menu_item_sort_prop ) {
</span><del>-                        return 0;        
-                } elseif ( 
-                        ( $_a == $a-&gt;$_menu_item_sort_prop ) &amp;&amp; 
-                        ( $_b == $b-&gt;$_menu_item_sort_prop ) 
</del><ins>+                        return 0;
+                } elseif (
+                        ( $_a == $a-&gt;$_menu_item_sort_prop ) &amp;&amp;
+                        ( $_b == $b-&gt;$_menu_item_sort_prop )
</ins><span class="cx">                 ) {
</span><span class="cx">                         return $_a &lt; $_b ? -1 : 1;
</span><span class="cx">                 } else {
</span><span class="lines">@@ -404,7 +404,7 @@
</span><span class="cx"> 
</span><span class="cx">         if ( ! $menu )
</span><span class="cx">                 return false;
</span><del>-        
</del><ins>+
</ins><span class="cx">         $items = get_objects_in_term( $menu-&gt;term_id, 'nav_menu' );
</span><span class="cx"> 
</span><span class="cx">         if ( ! empty( $items ) ) {
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx">  * - url:                The URL to which this menu item points.
</span><span class="cx">  * - title:                The title of this menu item.
</span><span class="cx">  * - target:                 The target attribute of the link element for this menu item.
</span><del>- * - attr_title:        The title attribute of the link element for this menu item.         
</del><ins>+ * - attr_title:        The title attribute of the link element for this menu item.
</ins><span class="cx">  * - classes:                The class attribute value for the link element of this menu item.
</span><span class="cx">  * - xfn:                The XFN relationship expressed in the link of this menu item.
</span><span class="cx">  * - description:        The description of this menu item.
</span><span class="lines">@@ -465,12 +465,12 @@
</span><span class="cx">                         $menu_item-&gt;object_id = get_post_meta( $menu_item-&gt;ID, '_menu_item_object_id', true );
</span><span class="cx">                         $menu_item-&gt;object = get_post_meta( $menu_item-&gt;ID, '_menu_item_object', true );
</span><span class="cx">                         $menu_item-&gt;type = get_post_meta( $menu_item-&gt;ID, '_menu_item_type', true );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         if ( 'post_type' == $menu_item-&gt;type ) {
</span><span class="cx">                                 $object = get_post_type_object( $menu_item-&gt;object );
</span><span class="cx">                                 $menu_item-&gt;append = $object-&gt;singular_label;
</span><span class="cx">                                 $menu_item-&gt;url = get_permalink( $menu_item-&gt;object_id );
</span><del>-                        
</del><ins>+
</ins><span class="cx">                                 $original_object = get_post( $menu_item-&gt;object_id );
</span><span class="cx">                                 $original_title = $original_object-&gt;post_title;
</span><span class="cx">                                 $menu_item-&gt;title = '' == $menu_item-&gt;post_title ? $original_title : $menu_item-&gt;post_title;
</span><span class="lines">@@ -488,7 +488,7 @@
</span><span class="cx">                                 $menu_item-&gt;title = $menu_item-&gt;post_title;
</span><span class="cx">                                 $menu_item-&gt;url = get_post_meta( $menu_item-&gt;ID, '_menu_item_url', true );
</span><span class="cx">                         }
</span><del>-                        
</del><ins>+
</ins><span class="cx">                         $menu_item-&gt;target = get_post_meta( $menu_item-&gt;ID, '_menu_item_target', true );
</span><span class="cx"> 
</span><span class="cx">                         $menu_item-&gt;attr_title = strip_tags( $menu_item-&gt;post_excerpt );
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">  * Get the menu items associated with a particular object.
</span><span class="cx">  *
</span><span class="cx">  * @since 3.0.0
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * @param int $object_id The ID of the original object.
</span><span class="cx">  * @param string $object_type The type of object, such as &quot;taxonomy&quot; or &quot;post_type.&quot;
</span><span class="cx">  * @return array The array of menu item IDs; empty array if none;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/post.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @param array|string $args An array of key =&gt; value arguments to match against the post status objects.
</span><span class="cx">  * @param string $output The type of output to return, either post status 'names' or 'objects'. 'names' is the default.
</span><del>- * @param string $operator The logical operation to perform. 'or' means only one element 
</del><ins>+ * @param string $operator The logical operation to perform. 'or' means only one element
</ins><span class="cx">  *  from the array needs to match; 'and' means all elements must match. The default is 'and'.
</span><span class="cx">  * @return array A list of post type names or objects
</span><span class="cx">  */
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @param array|string $args An array of key =&gt; value arguments to match against the post type objects.
</span><span class="cx">  * @param string $output The type of output to return, either post type 'names' or 'objects'. 'names' is the default.
</span><del>- * @param string $operator The logical operation to perform. 'or' means only one element 
</del><ins>+ * @param string $operator The logical operation to perform. 'or' means only one element
</ins><span class="cx">  *  from the array needs to match; 'and' means all elements must match. The default is 'and'.
</span><span class="cx">  * @return array A list of post type names or objects
</span><span class="cx">  */
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/query.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1719,7 +1719,7 @@
</span><span class="cx">                                         // Non-hierarchical post_types &amp; parent-level-hierarchical post_types can directly use 'name'
</span><span class="cx">                                         $q['name'] = $q[ $ptype_obj-&gt;query_var ];
</span><span class="cx">                                 } else {
</span><del>-                                        // Hierarchical post_types will operate through the 
</del><ins>+                                        // Hierarchical post_types will operate through the
</ins><span class="cx">                                         $q['pagename'] = $q[ $ptype_obj-&gt;query_var ];
</span><span class="cx">                                         $q['name'] = '';
</span><span class="cx">                                 }
</span><span class="lines">@@ -2482,7 +2482,7 @@
</span><span class="cx">                                 $stickies = $wpdb-&gt;get_results( &quot;SELECT * FROM $wpdb-&gt;posts WHERE $wpdb-&gt;posts.ID IN ($stickies__in) $stickies_where&quot; );
</span><span class="cx">                                 foreach ( $stickies as $sticky_post ) {
</span><span class="cx">                                         // Ignore sticky posts the current user cannot read or are not published.
</span><del>-                                        if ( 'publish' != $sticky_post-&gt;post_status ) 
</del><ins>+                                        if ( 'publish' != $sticky_post-&gt;post_status )
</ins><span class="cx">                                                 continue;
</span><span class="cx">                                         array_splice($this-&gt;posts, $sticky_offset, 0, array($sticky_post));
</span><span class="cx">                                         $sticky_offset++;
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/rewrite.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -1567,7 +1567,7 @@
</span><span class="cx">                 // robots.txt -only if installed at the root
</span><span class="cx">                 $home_path = parse_url( home_url() );
</span><span class="cx">                 $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' =&gt; $this-&gt;index . '?robots=1' ) : array();
</span><del>-                        
</del><ins>+
</ins><span class="cx">                 // Default Feed rules - These are require to allow for the direct access files to work with permalink structure starting with %category%
</span><span class="cx">                 $default_feeds = array(        '.*wp-atom.php$'        =&gt;        $this-&gt;index . '?feed=atom',
</span><span class="cx">                                                                 '.*wp-rdf.php$'                =&gt;        $this-&gt;index . '?feed=rdf',
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/taxonomy.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @param array $args An array of key =&gt; value arguments to match against the taxonomy objects.
</span><span class="cx">  * @param string $output The type of output to return, either taxonomy 'names' or 'objects'. 'names' is the default.
</span><del>- * @param string $operator The logical operation to perform. 'or' means only one element 
</del><ins>+ * @param string $operator The logical operation to perform. 'or' means only one element
</ins><span class="cx">  *  from the array needs to match; 'and' means all elements must match. The default is 'and'.
</span><span class="cx">  * @return array A list of taxonomy names or objects
</span><span class="cx">  */
</span><span class="lines">@@ -1571,7 +1571,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         // Seems unreachable, However, Is used in the case that a term name is provided, which sanitizes to an empty string.
</span><del>-        if ( empty($slug) ) { 
</del><ins>+        if ( empty($slug) ) {
</ins><span class="cx">                 $slug = sanitize_title($slug, $term_id);
</span><span class="cx">                 do_action( 'edit_terms', $term_id );
</span><span class="cx">                 $wpdb-&gt;update( $wpdb-&gt;terms, compact( 'slug' ), compact( 'term_id' ) );
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/theme.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -844,9 +844,9 @@
</span><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Retrieve path of home template in current or parent template.
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * This is the template used for the page containing the blog posts
</span><del>- * 
</del><ins>+ *
</ins><span class="cx">  * Attempts to locate 'home.php' first before falling back to 'index.php'.
</span><span class="cx">  *
</span><span class="cx">  * @since 1.5.0
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (14403 => 14404)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php        2010-05-03 20:21:30 UTC (rev 14403)
+++ trunk/wp-includes/widgets.php        2010-05-03 20:26:11 UTC (rev 14404)
</span><span class="lines">@@ -558,9 +558,9 @@
</span><span class="cx">         $wp_registered_sidebars[$sidebar['id']] = $sidebar;
</span><span class="cx"> 
</span><span class="cx">         add_theme_support('widgets');
</span><del>-        
</del><ins>+
</ins><span class="cx">         do_action( 'register_sidebar', $sidebar );
</span><del>-        
</del><ins>+
</ins><span class="cx">         return $sidebar['id'];
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -690,7 +690,7 @@
</span><span class="cx">  */
</span><span class="cx"> function wp_unregister_sidebar_widget($id) {
</span><span class="cx">         do_action( 'wp_unregister_sidebar_widget', $id );
</span><del>-        
</del><ins>+
</ins><span class="cx">         wp_register_sidebar_widget($id, '', '');
</span><span class="cx">         wp_unregister_widget_control($id);
</span><span class="cx"> }
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx">                 $params = apply_filters( 'dynamic_sidebar_params', $params );
</span><span class="cx"> 
</span><span class="cx">                 $callback = $wp_registered_widgets[$id]['callback'];
</span><del>-                
</del><ins>+
</ins><span class="cx">                 do_action( 'dynamic_sidebar', $wp_registered_widgets[$id] );
</span><span class="cx"> 
</span><span class="cx">                 if ( is_callable($callback) ) {
</span></span></pre>
</div>
</div>

</body>
</html>