<!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>[15235] trunk: Trim trailing whitespace.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15235">15235</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-06-11 20:19:35 +0000 (Fri, 11 Jun 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trim trailing whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincssiertldevcss">trunk/wp-admin/css/ie-rtl.dev.css</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminjsnavmenudevjs">trunk/wp-admin/js/nav-menu.dev.js</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="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincssiertldevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/ie-rtl.dev.css (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/ie-rtl.dev.css 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-admin/css/ie-rtl.dev.css 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -147,10 +147,10 @@
</span><span class="cx"> clear: both;
</span><span class="cx"> float: none;
</span><span class="cx"> }
</span><del>-#nav-menus-frame .open-label span {
- float: none;
- display: inline-block;
-}
-#nav-menus-frame .delete-action {
- float: none;
</del><ins>+#nav-menus-frame .open-label span {
+ float: none;
+ display: inline-block;
</ins><span class="cx"> }
</span><ins>+#nav-menus-frame .delete-action {
+ float: none;
+}
</ins></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-admin/includes/plugin.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -844,7 +844,7 @@
</span><span class="cx">
</span><span class="cx"> // No parent as top level
</span><span class="cx"> $_parent_pages[$menu_slug] = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $hookname;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -955,7 +955,7 @@
</span><span class="cx">
</span><span class="cx"> // No parent as top level
</span><span class="cx"> $_parent_pages[$menu_slug] = $parent_slug;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $hookname;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1173,18 +1173,18 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get the url to access a particular menu page based on the slug it was registered with.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * If the slug hasn't been registered properly no url will be returned
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since 3.0
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param string $menu_slug The slug name to refer to this menu by (should be unique for this menu)
</span><span class="cx"> * @param bool $echo Whether or not to echo the url - default is true
</span><span class="cx"> * @return string the url
</span><span class="cx"> */
</span><span class="cx"> function menu_page_url($menu_slug, $echo = true) {
</span><span class="cx"> global $_parent_pages;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( isset( $_parent_pages[$menu_slug] ) ) {
</span><span class="cx"> if ( $_parent_pages[$menu_slug] ) {
</span><span class="cx"> $url = admin_url($_parent_pages[$menu_slug] . '?page=' . $menu_slug);
</span><span class="lines">@@ -1194,12 +1194,12 @@
</span><span class="cx"> } else {
</span><span class="cx"> $url = '';
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> $url = esc_url($url);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( $echo )
</span><span class="cx"> echo $url;
</span><del>-
</del><ins>+
</ins><span class="cx"> return $url;
</span><span class="cx"> }
</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 (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/nav-menu.dev.js 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-admin/js/nav-menu.dev.js 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -698,9 +698,9 @@
</span><span class="cx"> * Refreshes the menu tabs.
</span><span class="cx"> * Will show and hide arrows where necessary.
</span><span class="cx"> * Scrolls to the active tab by default.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param savePosition {boolean} Optional. Prevents scrolling so
</span><del>- * that the current position is maintained. Default false.
</del><ins>+ * that the current position is maintained. Default false.
</ins><span class="cx"> **/
</span><span class="cx"> api.refreshMenuTabs = function( savePosition ) {
</span><span class="cx"> var fixedWidth = fixed.width(),
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-includes/nav-menu-template.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> foreach ( (array) $descs as $desc )
</span><span class="cx"> $term_to_ancestor[ $desc ] = $anc;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $terms as $desc ) {
</span><span class="cx"> do {
</span><span class="cx"> $possible_taxonomy_ancestors[ $taxonomy ][] = $desc;
</span><span class="lines">@@ -382,7 +382,7 @@
</span><span class="cx"> // ancestral term
</span><span class="cx"> (
</span><span class="cx"> 'taxonomy' == $parent_item->type &&
</span><del>- isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
</del><ins>+ isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
</ins><span class="cx"> in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-includes/nav-menu.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -747,16 +747,16 @@
</span><span class="cx"> */
</span><span class="cx"> function _wp_menu_changing_status_observer( $new_status, $old_status, $post ) {
</span><span class="cx"> // append new top-level page objects to a menu for which that option is selected
</span><del>- if (
- 'publish' == $new_status &&
- 'publish' != $old_status &&
- 'page' == $post->post_type &&
</del><ins>+ if (
+ 'publish' == $new_status &&
+ 'publish' != $old_status &&
+ 'page' == $post->post_type &&
</ins><span class="cx"> empty( $post->post_parent )
</span><span class="cx"> ) {
</span><span class="cx"> $auto_add = get_option( 'nav_menu_options' );
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> isset( $auto_add['auto_add'] ) &&
</span><del>- is_array( $auto_add['auto_add'] )
</del><ins>+ is_array( $auto_add['auto_add'] )
</ins><span class="cx"> ) {
</span><span class="cx"> $args = array(
</span><span class="cx"> 'menu-item-object-id' => $post->ID,
</span><span class="lines">@@ -776,14 +776,14 @@
</span><span class="cx"> wp_update_nav_menu_item( $menu_id, 0, $args );
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> // give menu items draft status if their associated post objects change from "publish" to "draft", or vice versa (draft item being re-published)
</span><del>- if (
</del><ins>+ if (
</ins><span class="cx"> ! empty( $post->ID ) &&
</span><del>- (
</del><ins>+ (
</ins><span class="cx"> ( 'publish' == $old_status && 'draft' == $new_status ) ||
</span><del>- ( 'draft' == $old_status && 'publish' == $new_status )
</del><ins>+ ( 'draft' == $old_status && 'publish' == $new_status )
</ins><span class="cx"> )
</span><span class="cx"> ) {
</span><span class="cx"> $menu_items = get_posts(array(
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-includes/theme.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -1547,12 +1547,12 @@
</span><span class="cx"> if ( ! in_array( $repeat, array( 'no-repeat', 'repeat-x', 'repeat-y', 'repeat' ) ) )
</span><span class="cx"> $repeat = 'repeat';
</span><span class="cx"> $repeat = " background-repeat: $repeat;";
</span><del>-
</del><ins>+
</ins><span class="cx"> $position = get_theme_mod( 'background_position_x', 'left' );
</span><span class="cx"> if ( ! in_array( $position, array( 'center', 'right', 'left' ) ) )
</span><span class="cx"> $position = 'left';
</span><span class="cx"> $position = " background-position: top $position;";
</span><del>-
</del><ins>+
</ins><span class="cx"> $attachment = get_theme_mod( 'background_attachment', 'scroll' );
</span><span class="cx"> if ( ! in_array( $attachment, array( 'fixed', 'scroll' ) ) )
</span><span class="cx"> $attachment = 'scroll';
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-includes/user.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -212,9 +212,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Get the current user's ID
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since MU
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses wp_get_current_user
</span><span class="cx"> *
</span><span class="cx"> * @return int The current user's ID
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-06-11 18:17:23 UTC (rev 15234)
+++ trunk/wp-signup.php 2010-06-11 20:19:35 UTC (rev 15235)
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> $blogs = get_blogs_of_user($current_user->ID);
</span><span class="cx"> if ( !empty($blogs) ) { ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <p><?php _e( 'Sites you are already a member of:' ) ?></p>
</span><span class="cx"> <ul>
</span><span class="cx"> <?php foreach ( $blogs as $blog ) {
</span></span></pre>
</div>
</div>
</body>
</html>