Skip to content

Commit e44ea1f

Browse files
ryanborenryanboren
committed
Remove trailing spaces and convert spaces to tabs. Props Nazgul. fixes WordPress#986
git-svn-id: https://develop.svn.wordpress.org/trunk@4495 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 603ec78 commit e44ea1f

99 files changed

Lines changed: 1532 additions & 1532 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎index.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?php
22
/* Short and sweet */
33
define('WP_USE_THEMES', true);
44
require('./wp-blog-header.php');

‎wp-admin/admin-ajax.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ function wp_ajax_meta_row( $pid, $mid, $key, $value ) {
128128
break;
129129
case 'add-cat' : // From Manage->Categories
130130
if ( !current_user_can( 'manage_categories' ) )
131-
die('-1');
131+
die('-1');
132132
if ( !$cat = wp_insert_category( $_POST ) )
133133
die('0');
134134
if ( !$cat = get_category( $cat ) )

‎wp-admin/admin-db.php‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ function get_editable_user_ids( $user_id, $exclude_zeros = true ) {
4848
if ( ! $user->has_cap('edit_others_posts') ) {
4949
if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
5050
return array($user->id);
51-
else
51+
else
5252
return false;
5353
}
5454

@@ -96,7 +96,7 @@ function wp_insert_category($catarr) {
9696
$update = false;
9797

9898
$cat_name = apply_filters('pre_category_name', $cat_name);
99-
99+
100100
if (empty ($category_nicename))
101101
$category_nicename = sanitize_title($cat_name);
102102
else
@@ -198,7 +198,7 @@ function wp_delete_category($cat_ID) {
198198
$cats = array($default_cat);
199199
else
200200
$cats = array_diff($cats, array($cat_ID));
201-
wp_set_post_categories($post_id, $cats);
201+
wp_set_post_categories($post_id, $cats);
202202
}
203203

204204
$default_link_cat = get_option('default_link_category');
@@ -209,9 +209,9 @@ function wp_delete_category($cat_ID) {
209209
$cats = array($default_link_cat);
210210
else
211211
$cats = array_diff($cats, array($cat_ID));
212-
wp_set_link_cats($link_id, $cats);
212+
wp_set_link_cats($link_id, $cats);
213213
}
214-
214+
215215
wp_cache_delete($cat_ID, 'category');
216216
wp_cache_delete('all_category_ids', 'category');
217217

@@ -285,9 +285,9 @@ function wp_delete_user($id, $reassign = 'novalue') {
285285

286286
function wp_revoke_user($id) {
287287
$id = (int) $id;
288-
288+
289289
$user = new WP_User($id);
290-
$user->remove_all_caps();
290+
$user->remove_all_caps();
291291
}
292292

293293
function wp_insert_link($linkdata) {
@@ -385,15 +385,15 @@ function wp_update_link($linkdata) {
385385
$link = add_magic_quotes($link);
386386

387387
// Passed link category list overwrites existing category list if not empty.
388-
if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
388+
if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
389389
&& 0 != count($linkdata['link_category']) )
390-
$link_cats = $linkdata['link_category'];
391-
else
392-
$link_cats = $link['link_category'];
390+
$link_cats = $linkdata['link_category'];
391+
else
392+
$link_cats = $link['link_category'];
393393

394394
// Merge old and new fields with new fields overwriting old ones.
395395
$linkdata = array_merge($link, $linkdata);
396-
$linkdata['link_category'] = $link_cats;
396+
$linkdata['link_category'] = $link_cats;
397397

398398
return wp_insert_link($linkdata);
399399
}
@@ -402,7 +402,7 @@ function wp_delete_link($link_id) {
402402
global $wpdb;
403403

404404
do_action('delete_link', $link_id);
405-
405+
406406
$categories = wp_get_link_cats($link_id);
407407
if( is_array( $categories ) ) {
408408
foreach ( $categories as $category ) {
@@ -418,9 +418,9 @@ function wp_delete_link($link_id) {
418418
function wp_get_link_cats($link_ID = 0) {
419419
global $wpdb;
420420

421-
$sql = "SELECT category_id
422-
FROM $wpdb->link2cat
423-
WHERE link_id = $link_ID
421+
$sql = "SELECT category_id
422+
FROM $wpdb->link2cat
423+
WHERE link_id = $link_ID
424424
ORDER BY category_id";
425425

426426
$result = $wpdb->get_col($sql);
@@ -441,8 +441,8 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
441441

442442
// First the old categories
443443
$old_categories = $wpdb->get_col("
444-
SELECT category_id
445-
FROM $wpdb->link2cat
444+
SELECT category_id
445+
FROM $wpdb->link2cat
446446
WHERE link_id = $link_ID");
447447

448448
if (!$old_categories) {
@@ -457,9 +457,9 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
457457
if ($delete_cats) {
458458
foreach ($delete_cats as $del) {
459459
$wpdb->query("
460-
DELETE FROM $wpdb->link2cat
461-
WHERE category_id = $del
462-
AND link_id = $link_ID
460+
DELETE FROM $wpdb->link2cat
461+
WHERE category_id = $del
462+
AND link_id = $link_ID
463463
");
464464
}
465465
}
@@ -470,11 +470,11 @@ function wp_set_link_cats($link_ID = 0, $link_categories = array()) {
470470
if ($add_cats) {
471471
foreach ($add_cats as $new_cat) {
472472
$wpdb->query("
473-
INSERT INTO $wpdb->link2cat (link_id, category_id)
473+
INSERT INTO $wpdb->link2cat (link_id, category_id)
474474
VALUES ($link_ID, $new_cat)");
475475
}
476476
}
477-
477+
478478
// Update category counts.
479479
$all_affected_cats = array_unique(array_merge($link_categories, $old_categories));
480480
foreach ( $all_affected_cats as $cat_id ) {

‎wp-admin/admin-functions.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,10 +1139,10 @@ function touch_time( $edit = 1, $for_post = 1 ) {
11391139
?>
11401140
</select>
11411141
<input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" onchange="edit_date.checked=true"/>
1142-
<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @
1143-
<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> :
1144-
<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
1145-
<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
1142+
<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @
1143+
<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> :
1144+
<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
1145+
<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
11461146
<?php
11471147
if ( $edit ) {
11481148
_e( 'Existing timestamp' );
@@ -1387,7 +1387,7 @@ function user_can_access_admin_page() {
13871387
return false;
13881388
}
13891389
}
1390-
1390+
13911391
return true;
13921392
}
13931393

‎wp-admin/bookmarklet.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
else
3636
$post->post_title = $popuptitle;
3737

38-
38+
3939
$content = wp_specialchars($_REQUEST['content']);
4040
$popupurl = wp_specialchars($_REQUEST['popupurl']);
41-
if ( !empty($content) ) {
42-
$post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
43-
} else {
44-
$post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
45-
}
41+
if ( !empty($content) ) {
42+
$post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
43+
} else {
44+
$post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
45+
}
4646

47-
/* /big funky fixes */
47+
/* /big funky fixes */
4848

4949
?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
5050
<html xmlns="http://www.w3.org/1999/xhtml">
@@ -77,15 +77,15 @@
7777
}
7878

7979
#wpbookmarklet .wrap {
80-
border: 0px;
80+
border: 0px;
8181
}
8282

8383
#wpbookmarklet #postdiv {
84-
margin-bottom: 0.5em;
84+
margin-bottom: 0.5em;
8585
}
8686

8787
#wpbookmarklet #titlediv {
88-
margin-bottom: 1em;
88+
margin-bottom: 1em;
8989
}
9090

9191
-->

‎wp-admin/categories.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@
4848

4949
case 'edit':
5050

51-
require_once ('admin-header.php');
52-
$cat_ID = (int) $_GET['cat_ID'];
53-
$category = get_category_to_edit($cat_ID);
54-
include('edit-category-form.php');
51+
require_once ('admin-header.php');
52+
$cat_ID = (int) $_GET['cat_ID'];
53+
$category = get_category_to_edit($cat_ID);
54+
include('edit-category-form.php');
5555

5656
break;
5757

‎wp-admin/custom-fields.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ function customFieldsAddIn() {
1414
for ( var i=0; i < inputs.length; i++ ) {
1515
if ('text' == inputs[i].type) {
1616
inputs[i].setAttribute('autocomplete', 'off');
17-
inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
17+
inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
1818
}
1919
if ('updatemeta' == inputs[i].className) {
20-
inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
20+
inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
2121
}
2222
}
2323

‎wp-admin/dbx-admin-key-js.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
break;
1010
case 'page.php' :
1111
case 'page-new.php' :
12-
$man = 'pagemeta';
12+
$man = 'pagemeta';
1313
break;
1414
case 'link.php' :
1515
$man = 'linkmeta';

‎wp-admin/edit-category-form.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
<?php wp_nonce_field($nonce_action); ?>
2323
<table class="editform" width="100%" cellspacing="2" cellpadding="5">
2424
<tr>
25-
<th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
26-
<td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /></td>
25+
<th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
26+
<td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /></td>
2727
</tr>
2828
<tr>
2929
<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category slug:') ?></label></th>

‎wp-admin/edit-comments.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ function getNumChecked(form)
143143
++$i; $class = '';
144144
$authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
145145
$comment_status = wp_get_comment_status($comment->comment_ID);
146-
if ('unapproved' == $comment_status)
146+
if ('unapproved' == $comment_status)
147147
$class .= ' unapproved';
148148
if ($i % 2)
149149
$class .= ' alternate';
@@ -153,7 +153,7 @@ function getNumChecked(form)
153153

154154
<?php comment_text() ?>
155155

156-
<p><?php comment_date('M j, g:i A'); ?> &#8212; [
156+
<p><?php comment_date('M j, g:i A'); ?> &#8212; [
157157
<?php
158158
if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
159159
echo " <a href='comment.php?action=editcomment&amp;c=".$comment->comment_ID."'>" . __('Edit') . '</a>';
@@ -181,7 +181,7 @@ function getNumChecked(form)
181181

182182
?>
183183
<p>
184-
<strong><?php _e('No comments found.') ?></strong></p>
184+
<strong><?php _e('No comments found.') ?></strong></p>
185185

186186
<?php
187187
} // end if ($comments)

0 commit comments

Comments
 (0)