Skip to content

Commit

Permalink
Trailing whitespace cleanup
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.automattic.com/wordpress/trunk@12733 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
ryan committed Jan 15, 2010
1 parent 439d50d commit 6da55f7
Show file tree
Hide file tree
Showing 59 changed files with 246 additions and 246 deletions.
14 changes: 7 additions & 7 deletions wp-activate.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

function wpmu_activate_stylesheet() {
?>
<style type="text/css">
<style type="text/css">
form { margin-top: 2em; }
#submit, #key { width: 90%; font-size: 24px; }
#language { margin-top: .5em; }
Expand All @@ -30,7 +30,7 @@ function wpmu_activate_stylesheet() {

<div id="content" class="widecolumn">
<?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>

<h2><?php _e('Activation Key Required') ?></h2>
<form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
<p>
Expand All @@ -41,11 +41,11 @@ function wpmu_activate_stylesheet() {
<input id="submit" type="submit" name="Submit" class="submit" value="<?php esc_attr_e('Activate') ?>" />
</p>
</form>

<?php } else {

$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
$result = wpmu_activate_signup($key);
$result = wpmu_activate_signup($key);
if ( is_wp_error($result) ) {
if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
$signup = $result->get_error_data();
Expand All @@ -69,18 +69,18 @@ function wpmu_activate_stylesheet() {
$user = new WP_User( (int) $user_id);
?>
<h2><?php _e('Your account is now active!'); ?></h2>

<div id="signup-welcome">
<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
</div>

<?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
<p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
<?php else: ?>
<p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
<?php endif;
}
}
}
?>
</div>
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
exit;
} elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
/**
* On really small MU installs run the upgrader every time,
* On really small MU installs run the upgrader every time,
* else run it less often to reduce load.
*
* @since 2.8.4b
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/categories.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
$submenu_file = "categories.php?taxonomy=$taxonomy&amp;post_type=$post_type";
} else {
$parent_file = 'edit.php';
$submenu_file = "categories.php?taxonomy=$taxonomy";
$submenu_file = "categories.php?taxonomy=$taxonomy";
}


Expand Down
32 changes: 16 additions & 16 deletions wp-admin/css/wp-admin-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ td.available-theme {
margin-left: 1em;
}
.quicktags, .search {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
/* 200 - 500
=================================== */
Expand Down Expand Up @@ -51,10 +51,10 @@ td.available-theme {
.button-secondary,
.button-highlighted,
#postcustomstuff .submit input {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#wpcontent select {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#quicktags {
background-position: right top;
Expand All @@ -69,7 +69,7 @@ td.available-theme {
margin-left: 0;
}
#your-profile legend {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#ajax-response.alignleft {
margin-left: 0;
Expand All @@ -93,7 +93,7 @@ td.available-theme {
.tablenav .displaying-num {
margin-right: 0;
margin-left: 10px;
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#postcustomstuff table input,
#postcustomstuff table select,
Expand All @@ -115,22 +115,22 @@ td.available-theme {
margin: 7px 15px 0 0;
}
#wphead h1 {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
float: right;
}
#wphead h1.long-title {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#adminmenu .wp-submenu a {
padding-left: 0;
padding-right: 12px;
border-width: 0 0 0 1px;
border-style: none none none solid;
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#adminmenu a.menu-top,
#adminmenu .wp-submenu-head {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
#adminmenu img.wp-menu-image {
float: right;
Expand Down Expand Up @@ -177,7 +177,7 @@ td.available-theme {
#adminmenu #awaiting-mod,
#adminmenu span.update-plugins,
#sidemenu li a span.update-plugins {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
margin-left: 0;
margin-right: 2px;
}
Expand All @@ -187,7 +187,7 @@ td.available-theme {
float: right;
}
.post-com-count-wrapper {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
.column-response .post-com-count {
float: right;
Expand Down Expand Up @@ -249,15 +249,15 @@ td.available-theme {
clear: right;
}
.description, .form-wrap p {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
/* 1500 - 1800
=================================== */
.meta-box-sortables .postbox .handlediv {
float: left;
}
.howto {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
.postarea h3 label {
float: right;
Expand Down Expand Up @@ -372,7 +372,7 @@ td.action-links, th.action-links {
margin-right: 10px;
}
.tool-box .title {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
.settings-toggle {
text-align: left;
Expand Down Expand Up @@ -413,7 +413,7 @@ td.action-links, th.action-links {
#screen-options-link-wrap,
#contextual-help-link-wrap {
float: left;
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
margin: 0 0 0 6px;
}
.metabox-prefs label {
Expand Down Expand Up @@ -476,7 +476,7 @@ td.action-links, th.action-links {
.inline-edit-row .catshow,
.inline-edit-row .cathide,
.inline-edit-row #bulk-titles div {
font-family: Tahoma, Arial, sans-serif;
font-family: Tahoma, Arial, sans-serif;
}
.quick-edit-row-post fieldset label.inline-edit-status {
float: right;
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/edit-tags.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
} else {
$parent_file = 'edit.php';
$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
}

if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) )
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/class-wp-filesystem-ftpext.php
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function get_contents($file, $type = '', $resumepos = 0 ) {
function get_contents_array($file) {
return explode("\n", $this->get_contents($file));
}

function put_contents($file, $contents, $mode = false ) {
$temp = tmpfile();
if ( ! $temp )
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/comment.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ function get_pending_comments_num( $post_id ) {
else
return absint($pending[0]['num_comments']);
}

$pending_keyed = array();

// Default to zero pending for all posts in request
foreach ( $post_id_array as $id )
$pending_keyed[$id] = 0;
Expand Down
14 changes: 7 additions & 7 deletions wp-admin/includes/dashboard.php
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ function wp_dashboard_incoming_links_output() {

if ( !$rss->get_item_quantity() ) {
echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links&hellip; yet. It&#8217;s okay &#8212; there is no rush.') . "</p>\n";
$rss->__destruct();
$rss->__destruct();
unset($rss);
return;
}
Expand Down Expand Up @@ -691,7 +691,7 @@ function wp_dashboard_incoming_links_output() {
}

echo "</ul>\n";
$rss->__destruct();
$rss->__destruct();
unset($rss);
}

Expand Down Expand Up @@ -748,14 +748,14 @@ function wp_dashboard_secondary_output() {
echo '</p></div>';
}
} elseif ( !$rss->get_item_quantity() ) {
$rss->__destruct();
$rss->__destruct();
unset($rss);
return false;
} else {
echo '<div class="rss-widget">';
wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
echo '</div>';
$rss->__destruct();
$rss->__destruct();
unset($rss);
}
}
Expand Down Expand Up @@ -839,7 +839,7 @@ function wp_dashboard_plugins_output() {
echo "<h4>$label</h4>\n";
echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
echo "<p>$description</p>\n";

$$feed->__destruct();
unset($$feed);
}
Expand Down Expand Up @@ -938,9 +938,9 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
if ( is_wp_error($rss) ) {
$widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
} else {
$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
$rss->__destruct();
unset($rss);
unset($rss);
}
}
update_option( 'dashboard_widget_options', $widget_options );
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/file.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ function get_temp_dir() {

if ( function_exists('sys_get_temp_dir') )
return trailingslashit(sys_get_temp_dir());

$temp = ini_get('upload_tmp_dir');
if ( is_dir($temp) ) // always writable
return trailingslashit($temp);
Expand Down
4 changes: 2 additions & 2 deletions wp-admin/includes/image-edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function wp_image_editor($post_id, $msg = false) {
<div class="imgedit-menu">
<div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php

// On some setups GD library does not provide imagerotate() - Ticket #11536
// On some setups GD library does not provide imagerotate() - Ticket #11536
if ( function_exists('imagerotate') ) { ?>
<div class="imgedit-rleft" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
<div class="imgedit-rright" onclick="imageEdit.rotate(-90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate clockwise' ); ?>"></div>
Expand Down Expand Up @@ -96,7 +96,7 @@ function wp_image_editor($post_id, $msg = false) {
<div class="imgedit-group-top">
<a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a>
<div class="imgedit-help">
<p><?php _e('Discard any changes and restore the original image.');
<p><?php _e('Discard any changes and restore the original image.');

if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
_e(' Previously edited copies of the image will not be deleted.');
Expand Down
12 changes: 6 additions & 6 deletions wp-admin/includes/media.php
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ function get_attachment_fields_to_edit($post, $errors = null) {

$edit_post = sanitize_post($post, 'edit');



$form_fields = array(
'post_title' => array(
Expand Down Expand Up @@ -1223,10 +1223,10 @@ function get_media_item( $attachment_id, $args = null ) {
<p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
if ( !empty( $media_dims ) )
$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";

echo "</td></tr>\n";



$item .= "
</thead>
Expand All @@ -1248,12 +1248,12 @@ function get_media_item( $attachment_id, $args = null ) {
$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
} elseif ( !MEDIA_TRASH ) {
$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
<div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
<div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
</div>";
} else {
$delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
$delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
<a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion wp-admin/includes/misc.php
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function url_shorten( $url ) {

/**
* Resets global variables based on $_GET and $_POST
*
*
* This function resets global variables based on the names passed
* in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
* if neither is defined.
Expand Down
18 changes: 9 additions & 9 deletions wp-admin/includes/plugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@
*/
function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {

$default_headers = array(
'Name' => 'Plugin Name',
'PluginURI' => 'Plugin URI',
'Version' => 'Version',
'Description' => 'Description',
'Author' => 'Author',
'AuthorURI' => 'Author URI',
'TextDomain' => 'Text Domain',
'DomainPath' => 'Domain Path'
$default_headers = array(
'Name' => 'Plugin Name',
'PluginURI' => 'Plugin URI',
'Version' => 'Version',
'Description' => 'Description',
'Author' => 'Author',
'AuthorURI' => 'Author URI',
'TextDomain' => 'Text Domain',
'DomainPath' => 'Domain Path'
);

$plugin_data = get_file_data( $plugin_file, $default_headers, 'plugin' );
Expand Down
Loading

0 comments on commit 6da55f7

Please sign in to comment.