Ticket #986: 986-admin.diff

wp-admin/admin-ajax.php

@@ -139 +139 @@
         break;
 case 'add-cat' : // From Manage->Categories
         if ( !current_user_can( 'manage_categories' ) )
-                die('-1');
+                die('-1');
         if ( !$cat = wp_insert_category( $_POST ) )
                 die('0');
         if ( !$cat = get_category( $cat ) )

wp-admin/admin-db.php

@@ -48 +48 @@
         if ( ! $user->has_cap('edit_others_posts') ) {
                 if ( $user->has_cap('edit_posts') || $exclude_zeros == false )
                         return array($user->id);
-                else 
+                else
                         return false;
         }
 
@@ -93 +93 @@
                 $update = false;
 
         $cat_name = apply_filters('pre_category_name', $cat_name);
-        
+
         if (empty ($category_nicename))
                 $category_nicename = sanitize_title($cat_name);
         else
@@ -192 +192 @@
                         $cats = array($default_cat);
                 else
                         $cats = array_diff($cats, array($cat_ID));
-                wp_set_post_categories($post_id, $cats); 
+                wp_set_post_categories($post_id, $cats);
         }
 
         $default_link_cat = get_option('default_link_category');
@@ -203 +203 @@
                         $cats = array($default_link_cat);
                 else
                         $cats = array_diff($cats, array($cat_ID));
-                wp_set_link_cats($link_id, $cats); 
+                wp_set_link_cats($link_id, $cats);
         }
-        
+
         wp_cache_delete($cat_ID, 'category');
         wp_cache_delete('all_category_ids', 'category');
 
@@ -279 +279 @@
 
 function wp_revoke_user($id) {
         $id = (int) $id;
-        
+
         $user = new WP_User($id);
-        $user->remove_all_caps();       
+        $user->remove_all_caps();
 }
 
 function wp_insert_link($linkdata) {
@@ -347 +347 @@
         $link = add_magic_quotes($link);
 
         // Passed link category list overwrites existing category list if not empty.
-        if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+        if ( isset($linkdata['link_category']) && is_array($linkdata['link_category'])
                          && 0 != count($linkdata['link_category']) )
-                $link_cats = $linkdata['link_category'];
-        else 
-                $link_cats = $link['link_category'];
+                $link_cats = $linkdata['link_category'];
+        else
+                $link_cats = $link['link_category'];
 
         // Merge old and new fields with new fields overwriting old ones.
         $linkdata = array_merge($link, $linkdata);
-        $linkdata['link_category'] = $link_cats;
+        $linkdata['link_category'] = $link_cats;
 
         return wp_insert_link($linkdata);
 }
@@ -364 +364 @@
         global $wpdb;
 
         do_action('delete_link', $link_id);
-        
+
         $categories = wp_get_link_cats($link_id);
         if( is_array( $categories ) ) {
                 foreach ( $categories as $category ) {
@@ -380 +380 @@
 function wp_get_link_cats($link_ID = 0) {
         global $wpdb;
 
-        $sql = "SELECT category_id 
-                FROM $wpdb->link2cat 
-                WHERE link_id = $link_ID 
+        $sql = "SELECT category_id
+                FROM $wpdb->link2cat
+                WHERE link_id = $link_ID
                 ORDER BY category_id";
 
         $result = $wpdb->get_col($sql);
@@ -403 +403 @@
 
         // First the old categories
         $old_categories = $wpdb->get_col("
-                SELECT category_id 
-                FROM $wpdb->link2cat 
+                SELECT category_id
+                FROM $wpdb->link2cat
                 WHERE link_id = $link_ID");
 
         if (!$old_categories) {
@@ -419 +419 @@
         if ($delete_cats) {
                 foreach ($delete_cats as $del) {
                         $wpdb->query("
-                                DELETE FROM $wpdb->link2cat 
-                                WHERE category_id = $del 
-                                        AND link_id = $link_ID 
+                                DELETE FROM $wpdb->link2cat
+                                WHERE category_id = $del
+                                        AND link_id = $link_ID
                                 ");
                 }
         }
@@ -432 +432 @@
         if ($add_cats) {
                 foreach ($add_cats as $new_cat) {
                         $wpdb->query("
-                                INSERT INTO $wpdb->link2cat (link_id, category_id) 
+                                INSERT INTO $wpdb->link2cat (link_id, category_id)
                                 VALUES ($link_ID, $new_cat)");
                 }
         }
-        
+
         // Update category counts.
         $all_affected_cats = array_unique(array_merge($link_categories, $old_categories));
         foreach ( $all_affected_cats as $cat_id ) {

wp-admin/admin-functions.php

@@ -316 +316 @@
                 $text       = wp_specialchars(stripslashes(urldecode($_REQUEST['text'])));
                 $text       = funky_javascript_fix($text);
                 $popupurl   = wp_specialchars($_REQUEST['popupurl']);
-        $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
-    }
+                $post_content = '<a href="'.$popupurl.'">'.$post_title.'</a>'."\n$text";
+        }
 
         if ( !empty($_REQUEST['excerpt']) )
                 $post_excerpt = wp_specialchars(stripslashes($_REQUEST['excerpt']));
@@ -581 +581 @@
 
         if ($post_ID) {
                 $checked_categories = $wpdb->get_col("
-                     SELECT category_id
-                     FROM $wpdb->categories, $wpdb->post2cat
-                     WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
-                     ");
+                        SELECT category_id
+                        FROM $wpdb->categories, $wpdb->post2cat
+                        WHERE $wpdb->post2cat.category_id = cat_ID AND $wpdb->post2cat.post_id = '$post_ID'
+                        ");
 
                 if (count($checked_categories) == 0) {
                         // No selected categories, strange
@@ -592 +592 @@
                 }
         } else if ($link_id) {
                 $checked_categories = $wpdb->get_col("
-                     SELECT category_id
-                     FROM $wpdb->categories, $wpdb->link2cat
-                     WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
-                     ");
+                        SELECT category_id
+                        FROM $wpdb->categories, $wpdb->link2cat
+                        WHERE $wpdb->link2cat.category_id = cat_ID AND $wpdb->link2cat.link_id = '$link_id'
+                        ");
 
                 if (count($checked_categories) == 0) {
                         // No selected categories, strange
                         $checked_categories[] = $default;
-                }       
+                }
         } else {
                 $checked_categories[] = $default;
         }
@@ -664 +664 @@
                                         $edit = '';
 
                                 $class = ('alternate' == $class) ? '' : 'alternate';
-                                
+
                                 $category->category_count = number_format( $category->category_count );
                                 $category->link_count = number_format( $category->link_count );
                                 echo "<tr id='cat-$category->cat_ID' class='$class'><th scope='row'>$category->cat_ID</th><td>$pad $category->cat_name</td>
@@ -700 +700 @@
                 $id = $post->ID;
                 $class = ('alternate' == $class) ? '' : 'alternate';
 ?>
-  <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'> 
-    <th scope="row"><?php echo $post->ID; ?></th> 
-    <td>
-      <?php echo $pad; ?><?php the_title() ?>
-      <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?>
-    </td> 
-    <td><?php the_author() ?></td>
-    <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td> 
-        <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
-    <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> 
-    <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='" . wp_nonce_url("page.php?action=delete&amp;post=$id", 'delete-page_' . $id) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . "</a>"; } ?></td> 
-  </tr> 
+        <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>
+                <th scope="row"><?php echo $post->ID; ?></th>
+                <td>
+                        <?php echo $pad; ?><?php the_title() ?>
+                        <?php if ('private' == $post->post_status) _e(' - <strong>Private</strong>'); ?>
+                </td>
+                <td><?php the_author() ?></td>
+                <td><?php echo mysql2date('Y-m-d g:i a', $post->post_modified); ?></td>
+                <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e('View'); ?></a></td>
+                <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td>
+                <td><?php if ( current_user_can('edit_page', $id) ) { echo "<a href='" . wp_nonce_url("page.php?action=delete&amp;post=$id", 'delete-page_' . $id) .  "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . sprintf(__("You are about to delete the &quot;%s&quot; page.\\n&quot;OK&quot; to delete, &quot;Cancel&quot; to stop."), js_escape(get_the_title()) ) . "' );\">" . __('Delete') . "</a>"; } ?></td>
+        </tr>
 
 <?php
                 if ( $hierarchy) page_rows($id, $level + 1, $pages);
@@ -985 +985 @@
         $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue'])));
 
         if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) {
-                // We have a key/value pair. If both the select and the 
+                // We have a key/value pair. If both the select and the
                 // input for the key have data, the input takes precedence:
 
-                if ('#NONE#' != $metakeyselect)
+                if ('#NONE#' != $metakeyselect)
                         $metakey = $metakeyselect;
 
                 if ($metakeyinput)
                         $metakey = $metakeyinput; // default
 
                 $result = $wpdb->query("
-                                                INSERT INTO $wpdb->postmeta 
-                                                (post_id,meta_key,meta_value) 
+                                                INSERT INTO $wpdb->postmeta
+                                                (post_id,meta_key,meta_value)
                                                 VALUES ('$post_ID','$metakey','$metavalue')
                                         ");
                 return $wpdb->insert_id;
@@ -1030 +1030 @@
 
         if ( $for_post )
                 $edit = ( ('draft' == $post->post_status) && (!$post->post_date || '0000-00-00 00:00:00' == $post->post_date) ) ? false : true;
- 
+
         echo '<fieldset><legend><input type="checkbox" class="checkbox" name="edit_date" value="1" id="timestamp" /> <label for="timestamp">'.__('Edit timestamp').'</label></legend>';
 
         $time_adj = time() + (get_settings('gmt_offset') * 3600);
@@ -1052 +1052 @@
 ?>
 </select>
 <input type="text" id="jj" name="jj" value="<?php echo $jj; ?>" size="2" maxlength="2" onchange="edit_date.checked=true"/>
-<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @ 
-<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> : 
-<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> 
-<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> 
+<input type="text" id="aa" name="aa" value="<?php echo $aa ?>" size="4" maxlength="5" onchange="edit_date.checked=true" /> @
+<input type="text" id="hh" name="hh" value="<?php echo $hh ?>" size="2" maxlength="2" onchange="edit_date.checked=true" /> :
+<input type="text" id="mn" name="mn" value="<?php echo $mn ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
+<input type="hidden" id="ss" name="ss" value="<?php echo $ss ?>" size="2" maxlength="2" onchange="edit_date.checked=true" />
 <?php
         if ( $edit ) {
                 _e('Existing timestamp');
@@ -1201 +1201 @@
                 var startPos = myField.selectionStart;
                 var endPos = myField.selectionEnd;
                 myField.value = myField.value.substring(0, startPos)
-                              + myValue 
-                      + myField.value.substring(endPos, myField.value.length);
+                        + myValue
+                        + myField.value.substring(endPos, myField.value.length);
                 myField.focus();
                 myField.selectionStart = startPos + myValue.length;
                 myField.selectionEnd = startPos + myValue.length;
@@ -1314 +1314 @@
         global $menu_nopriv;
 
         $parent = get_admin_page_parent();
-        
+
         if ( isset($menu_nopriv[$pagenow]) )
                 return false;
 
@@ -1341 +1341 @@
                                 return false;
                 }
         }
-        
+
         return true;
 }
 
@@ -1413 +1413 @@
                                 $parent_file = $plugin_page;
                                 if ( isset($real_parent_file[$parent_file]) )
                                         $parent_file = $real_parent_file[$parent_file];
-                                        
+
                                 return $parent_file;
                         }
                 }
@@ -1853 +1853 @@
 
         // Compute the URL
         $url = $uploads['url'] . "/$filename";
-        
+
         $return = apply_filters( 'wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $type) );
 
         return $return;

wp-admin/admin.php

@@ -2 +2 @@
 if ( defined('ABSPATH') )
         require_once( ABSPATH . 'wp-config.php');
 else
-    require_once('../wp-config.php');
+        require_once('../wp-config.php');
 
 if ( get_option('db_version') != $wp_db_version )
         die (sprintf(__("Your database is out-of-date.  Please <a href='%s'>upgrade</a>."), get_option('siteurl') . '/wp-admin/upgrade.php'));
-    
+
 require_once(ABSPATH . 'wp-admin/admin-functions.php');
 require_once(ABSPATH . 'wp-admin/admin-db.php');
 require_once(ABSPATH . WPINC . '/registration.php');

wp-admin/bookmarklet.php

@@ -35 +35 @@
 else
         $post->post_title = $popuptitle;
 
-  
+
 $content  = wp_specialchars($_REQUEST['content']);
 $popupurl = wp_specialchars($_REQUEST['popupurl']);
-    if ( !empty($content) ) {
-        $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
-    } else {
-        $post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
-    }
+if ( !empty($content) ) {
+        $post->post_content = wp_specialchars( stripslashes($_REQUEST['content']) );
+} else {
+        $post->post_content = '<a href="'.$popupurl.'">'.$popuptitle.'</a>'."\n$text";
+}
 
-    /* /big funky fixes */
+/* /big funky fixes */
 
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -77 +77 @@
 }
 
 #wpbookmarklet .wrap {
-    border: 0px;
+        border: 0px;
 }
 
 #wpbookmarklet #postdiv {
-    margin-bottom: 0.5em;
+        margin-bottom: 0.5em;
 }
 
 #wpbookmarklet #titlediv {
-    margin-bottom: 1em;
+        margin-bottom: 1em;
 }
 
 -->

wp-admin/categories.php

@@ -30 +30 @@
         $cat_name = get_catname($cat_ID);
 
         // Don't delete the default cats.
-    if ( $cat_ID == get_option('default_category') )
+        if ( $cat_ID == get_option('default_category') )
                 die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one"), $cat_name));
 
-    if ( $cat_ID == get_option('default_link_category') )
+        if ( $cat_ID == get_option('default_link_category') )
                 die(sprintf(__("Can't delete the <strong>%s</strong> category: this is the default one for bookmarks"), $cat_name));
 
         wp_delete_category($cat_ID);
@@ -44 +44 @@
 
 case 'edit':
 
-    require_once ('admin-header.php');
-    $cat_ID = (int) $_GET['cat_ID'];
-    $category = get_category_to_edit($cat_ID);
-    include('edit-category-form.php');
+        require_once ('admin-header.php');
+        $cat_ID = (int) $_GET['cat_ID'];
+        $category = get_category_to_edit($cat_ID);
+        include('edit-category-form.php');
 
 break;
 
@@ -87 +87 @@
         <thead>
         <tr>
                 <th scope="col"><?php _e('ID') ?></th>
-        <th scope="col" style="text-align: left"><?php _e('Name') ?></th>
-        <th scope="col" style="text-align: left"><?php _e('Description') ?></th>
-        <th scope="col" width="90"><?php _e('Posts') ?></th>
-        <th scope="col" width="90"><?php _e('Bookmarks') ?></th>
-        <th colspan="2"><?php _e('Action') ?></th>
+                <th scope="col" style="text-align: left"><?php _e('Name') ?></th>
+                <th scope="col" style="text-align: left"><?php _e('Description') ?></th>
+                <th scope="col" width="90"><?php _e('Posts') ?></th>
+                <th scope="col" width="90"><?php _e('Bookmarks') ?></th>
+                <th colspan="2"><?php _e('Action') ?></th>
         </tr>
         </thead>
         <tbody id="the-list">

wp-admin/comment.php

@@ -89 +89 @@
                 $noredir = false;
         }
 
-        $postdata = get_post($p) or 
+        $postdata = get_post($p) or
                 die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php'));
 
         if ( ! $comment = get_comment($comment) )
@@ -114 +114 @@
 case 'unapprovecomment':
         $comment = (int) $_GET['comment'];
         check_admin_referer('unapprove-comment_' . $comment);
-        
+
         $p = (int) $_GET['p'];
         if (isset($_GET['noredir'])) {
                 $noredir = true;

wp-admin/custom-fields.js

@@ -14 +14 @@
         for ( var i=0; i < inputs.length; i++ ) {
                 if ('text' == inputs[i].type) {
                         inputs[i].setAttribute('autocomplete', 'off');
-                        inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
+                        inputs[i].onkeypress = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.name.slice(5),10) + '");', e); };
                 }
                 if ('updatemeta' == inputs[i].className) {
-                        inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
+                        inputs[i].onclick = function(e) {return killSubmit('theList.ajaxUpdater("meta", "meta-' + parseInt(this.parentNode.parentNode.id.slice(5),10) + '");', e); };
                 }
         }
 

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

@@ -9 +9 @@
                 break;
         case 'page.php' :
         case 'page-new.php' :
-                $man = 'pagemeta'; 
+                $man = 'pagemeta';
                 break;
         case 'link.php' :
                 $man = 'linkmeta';

wp-admin/edit-category-form.php

@@ -22 +22 @@
 <?php wp_nonce_field($nonce_action); ?>
         <table class="editform" width="100%" cellspacing="2" cellpadding="5">
                 <tr>
-                  <th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
-                  <td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /></td>
+                        <th width="33%" scope="row" valign="top"><label for="cat_name"><?php _e('Category name:') ?></label></th>
+                        <td width="67%"><input name="cat_name" id="cat_name" type="text" value="<?php echo wp_specialchars($category->cat_name); ?>" size="40" /></td>
                 </tr>
                 <tr>
                         <th scope="row" valign="top"><label for="category_nicename"><?php _e('Category slug:') ?></label></th>
@@ -31 +31 @@
                 </tr>
                 <tr>
                         <th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th>
-                        <td>        
+                        <td>
                         <select name='category_parent' id='category_parent'>
-          <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
-          <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
-          </select></td>
+                        <option value='0' <?php if (!$category->category_parent) echo " selected='selected'"; ?>><?php _e('None') ?></option>
+                        <?php wp_dropdown_cats($category->cat_ID, $category->category_parent); ?>
+                        </select></td>
                 </tr>
                 <tr>
                         <th scope="row" valign="top"><label for="category_description"><?php _e('Description: (optional)') ?></label></th>

wp-admin/edit-comments.php

@@ -39 +39 @@
 </script>
 <div class="wrap">
 <h2><?php _e('Comments'); ?></h2>
-<form name="searchform" action="" method="get" id="editcomments"> 
-  <fieldset> 
-  <legend><?php _e('Show Comments That Contain...') ?></legend> 
-  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" /> 
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  />  
-  <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
-  <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
-  </fieldset> 
+<form name="searchform" action="" method="get" id="editcomments">
+        <fieldset>
+        <legend><?php _e('Show Comments That Contain...') ?></legend>
+        <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" />
+        <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
+        <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+        <?php _e('(Searches within comment text, e-mail, URI, and IP address.)') ?>
+        </fieldset>
 </form>
 <p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p>
 <?php
@@ -105 +105 @@
                 ++$i; $class = '';
                 $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
                         $comment_status = wp_get_comment_status($comment->comment_ID);
-                        if ('unapproved' == $comment_status) 
+                        if ('unapproved' == $comment_status)
                                 $class .= ' unapproved';
                         if ($i % 2)
                                 $class .= ' alternate';
@@ -115 +115 @@
 
 <?php comment_text() ?>
 
-<p><?php comment_date('M j, g:i A');  ?> &#8212; [ 
+<p><?php comment_date('M j, g:i A');  ?> &#8212; [
 <?php
 if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
         echo " <a href='comment.php?action=editcomment&amp;comment=".$comment->comment_ID."'>" .  __('Edit') . '</a>';
@@ -143 +143 @@
 
                 ?>
                 <p>
-        <strong><?php _e('No comments found.') ?></strong></p>
+                        <strong><?php _e('No comments found.') ?></strong></p>
 
                 <?php
         } // end if ($comments)
@@ -154 +154 @@
                 wp_nonce_field('bulk-comments');
                 echo '<table class="widefat">
 <thead>
-  <tr>
-    <th scope="col"><input type="checkbox" onclick="checkAll(document.getElementById(\'deletecomments\'));" /></th>
-    <th scope="col" style="text-align: left">' .  __('Name') . '</th>
-    <th scope="col" style="text-align: left">' .  __('E-mail') . '</th>
-    <th scope="col" style="text-align: left">' . __('IP') . '</th>
-    <th scope="col" style="text-align: left">' . __('Comment Excerpt') . '</th>
-        <th scope="col" colspan="3">' .  __('Actions') . '</th>
-  </tr>
+        <tr>
+                <th scope="col"><input type="checkbox" onclick="checkAll(document.getElementById(\'deletecomments\'));" /></th>
+                <th scope="col" style="text-align: left">' .  __('Name') . '</th>
+                <th scope="col" style="text-align: left">' .  __('E-mail') . '</th>
+                <th scope="col" style="text-align: left">' . __('IP') . '</th>
+                <th scope="col" style="text-align: left">' . __('Comment Excerpt') . '</th>
+                <th scope="col" colspan="3">' .  __('Actions') . '</th>
+        </tr>
 </thead>';
                 foreach ($comments as $comment) {
                 $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
@@ -169 +169 @@
                 $class = ('alternate' == $class) ? '' : 'alternate';
                 $class .= ('unapproved' == $comment_status) ? ' unapproved' : '';
 ?>
-  <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
-    <td><?php comment_author_link() ?></td>
-    <td><?php comment_author_email_link() ?></td>
-    <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></td>
-    <td><?php comment_excerpt(); ?></td>
-    <td>
-        <?php if ('unapproved' == $comment_status) { ?>
-                (Unapproved)
-        <?php } else { ?>
-                <a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a>
-        <?php } ?>
-    </td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-        echo "<a href='comment.php?action=editcomment&amp;comment=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
-    <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-                echo "<a href=\"comment.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape( $comment->comment_author ))  . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> ";
+        <tr id="comment-<?php echo $comment->comment_ID; ?>" class='<?php echo $class; ?>'>
+                <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { ?><input type="checkbox" name="delete_comments[]" value="<?php echo $comment->comment_ID; ?>" /><?php } ?></td>
+                <td><?php comment_author_link() ?></td>
+                <td><?php comment_author_email_link() ?></td>
+                <td><a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></td>
+                <td><?php comment_excerpt(); ?></td>
+                <td>
+                        <?php if ('unapproved' == $comment_status) { ?>
+                                (Unapproved)
+                        <?php } else { ?>
+                                <a href="<?php echo get_permalink($comment->comment_post_ID); ?>#comment-<?php comment_ID() ?>" class="edit"><?php _e('View') ?></a>
+                        <?php } ?>
+                </td>
+                <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+                        echo "<a href='comment.php?action=editcomment&amp;comment=$comment->comment_ID' class='edit'>" .  __('Edit') . "</a>"; } ?></td>
+                <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+                        echo "<a href=\"comment.php?action=deletecomment&amp;p=".$comment->comment_post_ID."&amp;comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by &quot;%s&quot;.\\n&quot;Cancel&quot; to stop, &quot;OK&quot; to delete."), js_escape( $comment->comment_author ))  . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> ";
                 } ?></td>
-  </tr>
-                <?php 
+        </tr>
+                <?php
                 } // end foreach
         ?></table>
 <p class="submit"><input type="submit" name="delete_button" value="<?php _e('Delete Checked Comments &raquo;') ?>" onclick="var numchecked = getNumChecked(document.getElementById('deletecomments')); if(numchecked < 1) { alert('<?php _e("Please select some comments to delete"); ?>'); return false } return confirm('<?php printf(__("You are about to delete %s comments permanently \\n  \'Cancel\' to stop, \'OK\' to delete."), "' + numchecked + '"); ?>')" />
                         <input type="submit" name="spam_button" value="<?php _e('Mark Checked Comments as Spam &raquo;') ?>" onclick="return confirm('<?php _e("You are about to mark these comments as spam \\n  \'Cancel\' to stop, \'OK\' to mark as spam.") ?>')" /></p>
-  </form>
+</form>
 <div id="ajax-response"></div>
 <?php
         } else {

wp-admin/edit-form-advanced.php

@@ -8 +8 @@
 <?php endif; ?>
 
 <form name="post" action="post.php" method="post" id="post">
-<?php if ( (isset($mode) && 'bookmarklet' == $mode) || 
-            isset($_GET['popupurl']) ): ?>
+<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?>
 <input type="hidden" name="mode" value="bookmarklet" />
 <?php endif; ?>
 
@@ -83 +82 @@
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label> 
+<?php _e('Allow Comments') ?></label>
 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
 </div>
 </fieldset>
 
 <fieldset id="passworddiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Password-Protect Post') ?></h3>
 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div>
 </fieldset>
 
 <fieldset id="slugdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post slug') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Post slug') ?></h3>
 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div>
 </fieldset>
 
 <fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Post Status') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Post Status') ?></h3>
 <div class="dbx-content"><?php if ( current_user_can('publish_posts') ) : ?>
 <label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
 <?php endif; ?>
-          <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
-          <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
+        <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
+        <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
 </fieldset>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
@@ -119 +118 @@
 <h3 class="dbx-handle"><?php _e('Post author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
-<?php 
+<?php
 foreach ($authors as $o) :
 $o = get_userdata( $o->ID );
 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
@@ -138 +137 @@
 </div>
 
 <fieldset id="titlediv">
-  <legend><?php _e('Title') ?></legend> 
-  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
+        <legend><?php _e('Title') ?></legend>
+        <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
 </fieldset>
 
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
@@ -151 +150 @@
 <?php echo $form_prevstatus ?>
 
 
-<p class="submit"><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" /> 
-<?php 
+<p class="submit"><?php echo $saveasdraft; ?> <input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
+<?php
 if ('publish' != $post->post_status || 0 == $post_ID) {
 ?>
 <?php if ( current_user_can('publish_posts') ) : ?>
-        <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> 
+        <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
 <?php endif; ?>
 <?php
 }
 ?>
-<input name="referredby" type="hidden" id="referredby" value="<?php 
+<input name="referredby" type="hidden" id="referredby" value="<?php
 if ( !empty($_REQUEST['popupurl']) )
         echo wp_specialchars($_REQUEST['popupurl']);
 else if ( url_to_postid(wp_get_referer()) == $post_ID )
@@ -192 +191 @@
 <fieldset class="dbx-box">
 <h3 class="dbx-handle"><?php _e('Trackbacks') ?></h3>
 <div class="dbx-content"><?php _e('Send trackbacks to'); ?>: <?php echo $form_trackback; ?> (<?php _e('Separate multiple URIs with spaces'); ?>)
-<?php 
+<?php
 if ( ! empty($pings) )
         echo $pings;
 ?>
@@ -205 +204 @@
 <table cellpadding="3">
 <?php
 $metadata = has_meta($post_ID);
-list_meta($metadata); 
+list_meta($metadata);
 ?>
 
 </table>

wp-admin/edit-form-comment.php

@@ -18 +18 @@
 addLoadEvent(focusit);
 </script>
 <fieldset id="namediv">
-    <legend><label for="name"><?php _e('Name:') ?></label></legend>
+        <legend><label for="name"><?php _e('Name:') ?></label></legend>
         <div>
-          <input type="text" name="newcomment_author" size="25" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" />
-    </div>
+                <input type="text" name="newcomment_author" size="25" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" />
+        </div>
 </fieldset>
 <fieldset id="emaildiv">
-        <legend><label for="email"><?php _e('E-mail:') ?></label></legend>
-                <div>
-                  <input type="text" name="newcomment_author_email" size="20" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" />
-    </div>
+        <legend><label for="email"><?php _e('E-mail:') ?></label></legend>
+        <div>
+                <input type="text" name="newcomment_author_email" size="20" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" />
+        </div>
 </fieldset>
 <fieldset id="uridiv">
-        <legend><label for="URL"><?php _e('URI:') ?></label></legend>
-                <div>
-                  <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
-    </div>
+        <legend><label for="URL"><?php _e('URI:') ?></label></legend>
+        <div>
+                <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
+        </div>
 </fieldset>
 
 <fieldset style="clear: both;">
-        <legend><?php _e('Comment') ?></legend>
+        <legend><?php _e('Comment') ?></legend>
         <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url'); ?>
 </fieldset>
 
 <p class="submit"><input type="submit" name="editcomment" id="editcomment" value="<?php echo $submitbutton_text ?>" style="font-weight: bold;" tabindex="6" />
-  <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
+        <input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" />
 </p>
 
 </div>
@@ -54 +54 @@
         <tr>
                 <th scope="row" valign="top"><?php _e('Comment Status') ?>:</th>
                 <td><label for="comment_status_approved" class="selectit"><input id="comment_status_approved" name="comment_status" type="radio" value="1" <?php checked($comment->comment_approved, '1'); ?> /> <?php _e('Approved') ?></label><br />
-          <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> /> <?php _e('Moderated') ?></label><br />
-          <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
+                <label for="comment_status_moderated" class="selectit"><input id="comment_status_moderated" name="comment_status" type="radio" value="0" <?php checked($comment->comment_approved, '0'); ?> /> <?php _e('Moderated') ?></label><br />
+                <label for="comment_status_spam" class="selectit"><input id="comment_status_spam" name="comment_status" type="radio" value="spam" <?php checked($comment->comment_approved, 'spam'); ?> /> <?php _e('Spam') ?></label></td>
         </tr>
 
 <?php if ( current_user_can('edit_posts') ) : ?>
@@ -67 +67 @@
 
         <tr>
                 <th scope="row" valign="top"><?php _e('Delete'); ?>:</th>
-                <td><input name="deletecomment" class="button" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"return confirm('" . __("You are about to delete this comment \\n  \'Cancel\' to stop, \'OK\' to delete.") . "')\""; ?> /> 
+                <td><input name="deletecomment" class="button" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"return confirm('" . __("You are about to delete this comment \\n  \'Cancel\' to stop, \'OK\' to delete.") . "')\""; ?> />
                 <input type="hidden" name="comment" value="<?php echo $comment->comment_ID ?>" />
                 <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" />
                 <input type="hidden" name="noredir" value="1" />

wp-admin/edit-form.php

@@ -19 +19 @@
 </script>
 
 <div id="poststuff">
-    <fieldset id="titlediv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend> 
-          <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
-    </fieldset>
+        <fieldset id="titlediv">
+                <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>
+                <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
+        </fieldset>
 
-    <fieldset id="categorydiv">
-      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend> 
-          <div><?php dropdown_categories($post->post_category); ?></div>
-    </fieldset>
+        <fieldset id="categorydiv">
+                <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend>
+                <div><?php dropdown_categories($post->post_category); ?></div>
+        </fieldset>
 
 <br />
 <fieldset id="postdiv">
-    <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
+        <legend><a href="http://wordpress.org/docs/reference/post/#post" title="<?php _e('Help with post field') ?>"><?php _e('Post') ?></a></legend>
 <?php the_quicktags(); ?>
 <?php
  $rows = get_settings('default_post_edit_rows');
  if (($rows < 3) || ($rows > 100)) {
-     $rows = 10;
+        $rows = 10;
  }
 ?>
 <div><textarea rows="<?php echo $rows; ?>" cols="40" name="content" tabindex="4" id="content"><?php echo $post->post_content ?></textarea></div>
@@ -54 +54 @@
 <p><label for="trackback"> <?php printf(__('<a href="%s" title="Help on trackbacks"><strong>TrackBack</strong> a <abbr title="Universal Resource Identifier">URI</abbr></a>:</label> (Separate multiple <abbr title="Universal Resource Identifier">URI</abbr>s with spaces.)<br />'), 'http://wordpress.org/docs/reference/post/#trackback') ?>
         <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>
 
-<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" /> 
-  <input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
+<p class="submit"><input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="<?php _e('Save as Draft') ?>" />
+        <input name="saveasprivate" type="submit" id="saveasprivate" tabindex="10" value="<?php _e('Save as Private') ?>" />
 
          <?php if ( current_user_can('edit_posts') ) : ?>
-  <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" /> 
+        <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="<?php _e('Publish') ?>" />
 <?php endif; ?>
 
 <?php if ('bookmarklet' != $mode) {
-      echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
-  } ?>
-  <input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" />
+                echo '<input name="advanced" type="submit" id="advancededit" tabindex="7" value="' .  __('Advanced Editing &raquo;') . '" />';
+        } ?>
+        <input name="referredby" type="hidden" id="referredby" value="<?php if ( wp_get_referer() ) echo urlencode(wp_get_referer()); ?>" />
 </p>
 
 <?php do_action('simple_edit_form', ''); ?>

wp-admin/edit-link-form.php

@@ -30 +30 @@
 }
 ?>
 
-<div class="wrap"> 
+<div class="wrap">
 <h2><?php echo $heading ?></h2>
 <?php echo $form ?>
 <?php wp_nonce_field($nonce_action); ?>
@@ -48 +48 @@
 </fieldset>
 
 <fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Target') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Target') ?></h3>
 <div class="dbx-content">
 <label for="link_target_blank" class="selectit">
 <input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> />
@@ -63 +63 @@
 </fieldset>
 
 <fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Visible') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Visible') ?></h3>
 <div class="dbx-content">
 <label for="link_visible_yes" class="selectit">
 <input id="link_visible_yes" type="radio" name="link_visible" <?php if ($link->link_visible == 'Y') echo "checked='checked'"; ?> value="Y" />

wp-admin/edit-page-form.php

@@ -17 +17 @@
 $sendto = wp_get_referer();
 
 if ( 0 != $post_ID && $sendto == get_permalink($post_ID) )
-        $sendto = 'redo';
+        $sendto = 'redo';
 $sendto = wp_specialchars( $sendto );
 
 ?>
@@ -28 +28 @@
 wp_nonce_field($nonce_action);
 
 if (isset($mode) && 'bookmarklet' == $mode) {
-    echo '<input type="hidden" name="mode" value="bookmarklet" />';
+        echo '<input type="hidden" name="mode" value="bookmarklet" />';
 }
 ?>
 <input type="hidden" name="user_ID" value="<?php echo $user_ID ?>" />
@@ -54 +54 @@
 <input name="advanced_view" type="hidden" value="1" />
 <label for="comment_status" class="selectit">
 <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> />
-<?php _e('Allow Comments') ?></label> 
+<?php _e('Allow Comments') ?></label>
 <label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label>
 </div>
 </fieldset>
 
 <fieldset class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Status') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page Status') ?></h3>
 <div class="dbx-content"><?php if ( current_user_can('publish_pages') ) : ?>
 <label for="post_status_publish" class="selectit"><input id="post_status_publish" name="post_status" type="radio" value="publish" <?php checked($post->post_status, 'publish'); checked($post->post_status, 'future'); ?> /> <?php _e('Published') ?></label>
 <?php endif; ?>
-          <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
-          <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
+        <label for="post_status_draft" class="selectit"><input id="post_status_draft" name="post_status" type="radio" value="draft" <?php checked($post->post_status, 'draft'); ?> /> <?php _e('Draft') ?></label>
+        <label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="radio" value="private" <?php checked($post->post_status, 'private'); ?> /> <?php _e('Private') ?></label></div>
 </fieldset>
 
 <fieldset id="passworddiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Password-Protect Page') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Password-Protect Page') ?></h3>
 <div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo $post->post_password ?>" /></div>
 </fieldset>
 
 <fieldset id="pageparent" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Parent') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page Parent') ?></h3>
 <div class="dbx-content"><p><select name="parent_id">
 <option value='0'><?php _e('Main Page (no parent)'); ?></option>
 <?php parent_dropdown($post->post_parent); ?>
@@ -84 +84 @@
 
 <?php if ( 0 != count( get_page_templates() ) ) { ?>
 <fieldset id="pageparent" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Template:') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page Template:') ?></h3>
 <div class="dbx-content"><p><select name="page_template">
                 <option value='default'><?php _e('Default Template'); ?></option>
                 <?php page_template_dropdown($post->page_template); ?>
@@ -94 +94 @@
 <?php } ?>
 
 <fieldset id="slugdiv" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page slug') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page slug') ?></h3>
 <div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo $post->post_name ?>" /></div>
 </fieldset>
 
@@ -103 +103 @@
 <h3 class="dbx-handle"><?php _e('Page author'); ?>:</h3>
 <div class="dbx-content">
 <select name="post_author_override" id="post_author_override">
-<?php 
+<?php
 foreach ($authors as $o) :
 $o = get_userdata( $o->ID );
 if ( $post->post_author == $o->ID || ( empty($post_ID) && $user_ID == $o->ID ) ) $selected = 'selected="selected"';
@@ -117 +117 @@
 <?php endif; ?>
 
 <fieldset id="pageorder" class="dbx-box">
-<h3 class="dbx-handle"><?php _e('Page Order') ?></h3> 
+<h3 class="dbx-handle"><?php _e('Page Order') ?></h3>
 <div class="dbx-content"><p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p></div>
 </fieldset>
 
@@ -127 +127 @@
 </div>
 
 <fieldset id="titlediv">
-  <legend><?php _e('Page Title') ?></legend> 
-  <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
+        <legend><?php _e('Page Title') ?></legend>
+        <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo $post->post_title; ?>" id="title" /></div>
 </fieldset>
 
 
 <fieldset id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>">
-    <legend><?php _e('Page Content') ?></legend>
+        <legend><?php _e('Page Content') ?></legend>
         <?php the_editor($post->post_content); ?>
 </fieldset>
 
 <p class="submit">
 <input name="save" type="submit" id="save" tabindex="3" value="<?php _e('Save and Continue Editing'); ?>" />
-<input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" /> 
-<?php 
+<input type="submit" name="submit" value="<?php _e('Save') ?>" style="font-weight: bold;" tabindex="4" />
+<?php
 if ('publish' != $post->post_status || 0 == $post_ID):
 ?>
 <?php if ( current_user_can('publish_pages') ) : ?>
-        <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> 
+        <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
 <?php endif; endif;?>
 <input name="referredby" type="hidden" id="referredby" value="<?php echo $sendto; ?>" />
 </p>
@@ -167 +167 @@
 <h3 class="dbx-handle"><?php _e('Custom Fields') ?></h3>
 <div id="postcustomstuff" class="dbx-content">
 <table cellpadding="3">
-<?php 
+<?php
 $metadata = has_meta($post_ID);
-list_meta($metadata); 
+list_meta($metadata);
 ?>
 
 </table>
@@ -184 +184 @@
 </div>
 
 <?php if ('edit' == $action) :
-        $delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID ); 
+        $delete_nonce = wp_create_nonce( 'delete-page_' . $post_ID );
         if ( current_user_can('delete_page', $post->ID) ) ?>
                 <input name="deletepost" class="button" type="submit" id="deletepost" tabindex="10" value="<?php _e('Delete this page') ?>" <?php echo "onclick=\"if ( confirm('" . sprintf(__("You are about to delete this page \'%s\'\\n  \'Cancel\' to stop, \'OK\' to delete."), js_escape($post->post_title) ) . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true;}return false;\""; ?> />
 <?php endif; ?>

wp-admin/edit-pages.php

@@ -10 +10 @@
 <h2><?php _e('Page Management'); ?></h2>
 <p><?php _e('Pages are like posts except they live outside of the normal blog chronology and can be hierarchical. You can use pages to organize and manage any amount of content.'); ?> <a href="page-new.php"><?php _e('Create a new page &raquo;'); ?></a></p>
 
-<form name="searchform" action="" method="get"> 
-  <fieldset> 
-  <legend><?php _e('Search Pages&hellip;') ?></legend>
-  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" /> 
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
-  </fieldset>
+<form name="searchform" action="" method="get">
+        <fieldset>
+        <legend><?php _e('Search Pages&hellip;') ?></legend>
+        <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo wp_specialchars($_GET['s'], 1); ?>" size="17" />
+        <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
+        </fieldset>
 </form>
 
 <?php
@@ -28 +28 @@
 
 if ($posts) {
 ?>
-<table class="widefat"> 
-  <thead>
-  <tr>
-    <th scope="col"><?php _e('ID') ?></th>
-    <th scope="col" style="text-align: left"><?php _e('Title') ?></th>
-    <th scope="col" style="text-align: left"><?php _e('Owner') ?></th>
-        <th scope="col" style="text-align: left"><?php _e('Updated') ?></th>
-        <th scope="col" colspan="3"><?php _e('Action'); ?></th>
-  </tr>
-  </thead>
-  <tbody id="the-list">
+<table class="widefat">
+        <thead>
+                <tr>
+                        <th scope="col"><?php _e('ID') ?></th>
+                        <th scope="col" style="text-align: left"><?php _e('Title') ?></th>
+                        <th scope="col" style="text-align: left"><?php _e('Owner') ?></th>
+                        <th scope="col" style="text-align: left"><?php _e('Updated') ?></th>
+                        <th scope="col" colspan="3"><?php _e('Action'); ?></th>
+                </tr>
+        </thead>
+        <tbody id="the-list">
 <?php
 page_rows(0, 0, $posts, $all);
 ?>
-  </tbody>
+        </tbody>
 </table>
 
 <div id="ajax-response"></div>
@@ -53 +53 @@
 <p><?php _e('No pages yet.') ?></p>
 <?php
 } // end if ($posts)
-?> 
+?>
 
 <h3><a href="page-new.php"><?php _e('Create New Page &raquo;'); ?></a></h3>
 
 </div>
 
-<?php include('admin-footer.php'); ?> 
+<?php include('admin-footer.php'); ?>

wp-admin/edit.php

@@ -12 +12 @@
 $other_drafts = get_others_drafts( $user_ID);
 
 if ($drafts || $other_drafts) {
-?> 
+?>
 <div class="wrap">
 <?php if ($drafts) { ?>
-    <p><strong><?php _e('Your Drafts:') ?></strong> 
-    <?php
+        <p><strong><?php _e('Your Drafts:') ?></strong>
+        <?php
         $i = 0;
         foreach ($drafts as $draft) {
                 if (0 != $i)
@@ -27 +27 @@
                 echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
                 ++$i;
                 }
-        ?> 
-    .</p> 
+        ?>
+        .</p>
 <?php } ?>
 
-<?php if ($other_drafts) { ?> 
-    <p><strong><?php _e('Other&#8217;s Drafts:') ?></strong> 
-    <?php
+<?php if ($other_drafts) { ?>
+        <p><strong><?php _e('Other&#8217;s Drafts:') ?></strong>
+        <?php
         $i = 0;
         foreach ($other_drafts as $draft) {
                 if (0 != $i)
@@ -44 +44 @@
                 echo "<a href='post.php?action=edit&amp;post=$draft->ID' title='" . __('Edit this draft') . "'>$draft->post_title</a>";
                 ++$i;
                 }
-        ?> 
-    .</p> 
+        ?>
+        .</p>
 
 <?php } ?>
 
@@ -73 +73 @@
 ?>
 </h2>
 
-<form name="searchform" action="" method="get" style="float: left; width: 16em; margin-right: 3em;"> 
-  <fieldset> 
-  <legend><?php _e('Search Posts&hellip;') ?></legend> 
-  <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" /> 
-  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
-  </fieldset>
+<form name="searchform" action="" method="get" style="float: left; width: 16em; margin-right: 3em;">
+        <fieldset>
+        <legend><?php _e('Search Posts&hellip;') ?></legend>
+        <input type="text" name="s" value="<?php if (isset($s)) echo wp_specialchars($s, 1); ?>" size="17" />
+        <input type="submit" name="submit" value="<?php _e('Search') ?>"  />
+        </fieldset>
 </form>
 
 <?php $arc_result = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC");
@@ -88 +88 @@
 <form name="viewarc" action="" method="get" style="float: left; width: 20em; margin-bottom: 1em;">
         <fieldset>
         <legend><?php _e('Browse Month&hellip;') ?></legend>
-    <select name='m'>
+        <select name='m'>
         <?php
                 foreach ($arc_result as $arc_row) {
                         if ( $arc_row->yyear == 0 )
@@ -106 +106 @@
                 }
         ?>
         </select>
-                <input type="submit" name="submit" value="<?php _e('Show Month') ?>"  /> 
+                <input type="submit" name="submit" value="<?php _e('Show Month') ?>"  />
         </fieldset>
 </form>
 
@@ -117 +117 @@
 <?php
 // define the columns to display, the syntax is 'internal name' => 'display name'
 $posts_columns = array(
-  'id'         => __('ID'),
-  'date'       => __('When'),
-  'title'      => __('Title'),
-  'categories' => __('Categories'),
-  'comments'   => __('Comments'),
-  'author'     => __('Author')
+        'id'         => __('ID'),
+        'date'       => __('When'),
+        'title'      => __('Title'),
+        'categories' => __('Categories'),
+        'comments'   => __('Comments'),
+        'author'     => __('Author')
 );
 $posts_columns = apply_filters('manage_posts_columns', $posts_columns);
 
@@ -133 +133 @@
 
 ?>
 
-<table class="widefat"> 
+<table class="widefat">
         <thead>
         <tr>
 
@@ -150 +150 @@
 foreach ($posts as $post) { start_wp();
 add_filter('the_title','wp_specialchars');
 $class = ('alternate' == $class) ? '' : 'alternate';
-?> 
+?>
         <tr id='post-<?php echo $id; ?>' class='<?php echo $class; ?>'>
 
 <?php
@@ -185 +185 @@
 
         case 'comments':
                 ?>
-                <td style="text-align: center"><a href="edit.php?p=<?php echo $id ?>&amp;c=1"> 
-      <?php comments_number(__('0'), __('1'), __('%')) ?> 
-      </a></td>
+                <td style="text-align: center"><a href="edit.php?p=<?php echo $id ?>&amp;c=1">
+                        <?php comments_number(__('0'), __('1'), __('%')) ?>
+                        </a></td>
                 <?php
                 break;
 
@@ -223 +223 @@
         }
 }
 ?>
-        </tr> 
+        </tr>
 <?php
 }
 } else {
 ?>
-  <tr style='background-color: <?php echo $bgcolor; ?>'> 
-    <td colspan="8"><?php _e('No posts found.') ?></td> 
-  </tr> 
+        <tr style='background-color: <?php echo $bgcolor; ?>'>
+                <td colspan="8"><?php _e('No posts found.') ?></td>
+        </tr>
 <?php
 } // end if ($posts)
 ?>
@@ -249 +249 @@
 
         $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $id AND comment_approved != 'spam' ORDER BY comment_date");
         if ($comments) {
-        ?> 
-<h3 id="comments"><?php _e('Comments') ?></h3> 
-<ol id="the-comment-list" class="commentlist"> 
+        ?>
+<h3 id="comments"><?php _e('Comments') ?></h3>
+<ol id="the-comment-list" class="commentlist">
 <?php
 $i = 0;
 foreach ($comments as $comment) {
@@ -259 +259 @@
                 ++$i; $class = '';
                 $authordata = get_userdata($wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = $comment->comment_post_ID"));
                         $comment_status = wp_get_comment_status($comment->comment_ID);
-                        if ('unapproved' == $comment_status) 
+                        if ('unapproved' == $comment_status)
                                 $class .= ' unapproved';
                         if ($i % 2)
                                 $class .= ' alternate';
@@ -289 +289 @@
         echo '</ol>';
         }//end if comments
         ?>
-<?php } ?> 
-</div> 
-<?php 
+<?php } ?>
+</div>
+<?php
  include('admin-footer.php');
-?> 
+?>

wp-admin/export.php

@@ -33 +33 @@
 $posts = $wpdb->get_results("SELECT * FROM $wpdb->posts ORDER BY post_date_gmt ASC");
 ?>
 <!-- generator="wordpress/<?php bloginfo_rss('version') ?>" created="<?php echo date('Y-m-d H:m'); ?>"-->
-<rss version="2.0" 
+<rss version="2.0"
         xmlns:content="http://purl.org/rss/1.0/modules/content/"
         xmlns:wfw="http://wellformedweb.org/CommentAPI/"
         xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -68 +68 @@
 <wp:post_parent><?php echo $post->post_parent; ?></wp:post_parent>
 <wp:post_type><?php echo $post->post_type; ?></wp:post_type>
 <?php
-$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID"); 
+$postmeta = $wpdb->get_results("SELECT * FROM $wpdb->postmeta WHERE post_id = $post->ID");
 if ( $postmeta ) {
 ?>
 <?php foreach( $postmeta as $meta ) { ?>
@@ -79 +79 @@
 <?php } ?>
 <?php } ?>
 <?php
-$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID"); 
+$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = $post->ID");
 if ( $comments ) { foreach ( $comments as $c ) { ?>
 <wp:comment>
 <wp:comment_author><?php echo $c->comment_author; ?></wp:comment_author>

wp-admin/index.php

@@ -1 +1 @@
 <?php
-require_once('admin.php'); 
-$title = __('Dashboard'); 
+require_once('admin.php');
+$title = __('Dashboard');
 require_once('admin-header.php');
 require_once (ABSPATH . WPINC . '/rss.php');
 
@@ -45 +45 @@
 <?php endif; ?>
 
 <ul>
-<?php 
+<?php
 if ( $comments ) {
 foreach ($comments as $comment) {
         echo '<li>' . sprintf(__('%1$s on %2$s'), get_comment_author_link(), '<a href="'. get_permalink($comment->comment_post_ID) . '#comment-' . $comment->comment_ID . '">' . get_the_title($comment->comment_post_ID) . '</a>');
-        edit_comment_link(__("Edit"), ' <small>(', ')</small>'); 
+        edit_comment_link(__("Edit"), ' <small>(', ')</small>');
         echo '</li>';
 }
 }
@@ -79 +79 @@
 
 <?php
 if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'future' ORDER BY post_date ASC") ) :
-?> 
+?>
 <div>
 <h3><?php _e('Scheduled Entries:') ?></h3>
 <ul>
@@ -89 +89 @@
                 $post->post_title = sprintf(__('Post #%s'), $post->ID);
         echo "<li>" . sprintf(__('%1$s in %2$s'), "<a href='post.php?action=edit&amp;post=$post->ID' title='" . __('Edit this post') . "'>$post->post_title</a>", human_time_diff( current_time('timestamp', 1), strtotime($post->post_date_gmt. ' GMT') ))  . "</li>";
 }
-?> 
+?>
 </ul>
 </div>
 <?php endif; ?>
@@ -98 +98 @@
 <h3><?php _e('Blog Stats'); ?></h3>
 <?php
 $numposts = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish'");
-if (0 < $numposts) $numposts = number_format($numposts); 
+if (0 < $numposts) $numposts = number_format($numposts);
 
 $numcomms = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '1'");
 if (0 < $numcomms) $numcomms = number_format($numcomms);

wp-admin/install-helper.php

@@ -9 +9 @@
  **           false on error
  */
 function maybe_create_table($table_name, $create_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    return false;
+        global $wpdb;
+        foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+                if ($table == $table_name) {
+                        return true;
+                }
+        }
+        //didn't find it try to create it.
+        $q = $wpdb->query($create_ddl);
+        // we cannot directly tell that whether this succeeded!
+        foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+                if ($table == $table_name) {
+                        return true;
+                }
+        }
+        return false;
 }
 
 /**
@@ -33 +33 @@
  **           false on error
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-    global $wpdb, $debug;
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($debug) echo("checking $column == $column_name<br />");
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    return false;
+        global $wpdb, $debug;
+        foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+                if ($debug) echo("checking $column == $column_name<br />");
+                        if ($column == $column_name) {
+                                return true;
+                        }
+        }
+        //didn't find it try to create it.
+        $q = $wpdb->query($create_ddl);
+        // we cannot directly tell that whether this succeeded!
+        foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+                if ($column == $column_name) {
+                        return true;
+                }
+        }
+        return false;
 }
 
 
@@ -59 +59 @@
  **           false on error
  */
 function maybe_drop_column($table_name, $column_name, $drop_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-        if ($column == $column_name) {
-            //found it try to drop it.
-            $q = $wpdb->query($drop_ddl);
-            // we cannot directly tell that whether this succeeded!
-            foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
-                if ($column == $column_name) {
-                    return false;
-                }
-            }
-        }
-    }
-    // else didn't find it
-    return true;
+        global $wpdb;
+        foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+                if ($column == $column_name) {
+                        //found it try to drop it.
+                        $q = $wpdb->query($drop_ddl);
+                        // we cannot directly tell that whether this succeeded!
+                        foreach ($wpdb->get_col("DESC $table_name",0) as $column ) {
+                                if ($column == $column_name) {
+                                        return false;
+                                }
+                        }
+                }
+        }
+        // else didn't find it
+        return true;
 }
 
 
@@ -92 +92 @@
  **      Extra
  */
 function check_column($table_name, $col_name, $col_type, $is_null = null, $key = null, $default = null, $extra = null) {
-    global $wpdb, $debug;
-    $diffs = 0;
-    $results = $wpdb->get_results("DESC $table_name");
-    
-    foreach ($results as $row ) {
-        if ($debug > 1) print_r($row);
-        if ($row->Field == $col_name) {
-            // got our column, check the params
-            if ($debug) echo ("checking $row->Type against $col_type\n");
-            if (($col_type != null) && ($row->Type != $col_type)) {
-                ++$diffs;
-            }
-            if (($is_null != null) && ($row->Null != $is_null)) {
-                ++$diffs;
-            }
-            if (($key != null) && ($row->Key  != $key)) {
-                ++$diffs;
-            }
-            if (($default != null) && ($row->Default != $default)) {
-                ++$diffs;
-            }
-            if (($extra != null) && ($row->Extra != $extra)) {
-                ++$diffs;
-            }
-            if ($diffs > 0) {
-                if ($debug) echo ("diffs = $diffs returning false\n");
-                return false;
-            }
-            return true;
-        } // end if found our column
-    }
-    return false;
+        global $wpdb, $debug;
+        $diffs = 0;
+        $results = $wpdb->get_results("DESC $table_name");
+
+        foreach ($results as $row ) {
+                if ($debug > 1) print_r($row);
+                        if ($row->Field == $col_name) {
+                                // got our column, check the params
+                                if ($debug) echo ("checking $row->Type against $col_type\n");
+                                if (($col_type != null) && ($row->Type != $col_type)) {
+                                        ++$diffs;
+                                }
+                                if (($is_null != null) && ($row->Null != $is_null)) {
+                                        ++$diffs;
+                                }
+                                if (($key != null) && ($row->Key  != $key)) {
+                                        ++$diffs;
+                                }
+                                if (($default != null) && ($row->Default != $default)) {
+                                        ++$diffs;
+                                }
+                                if (($extra != null) && ($row->Extra != $extra)) {
+                                        ++$diffs;
+                                }
+                                if ($diffs > 0) {
+                                        if ($debug) echo ("diffs = $diffs returning false\n");
+                                        return false;
+                                }
+                                return true;
+                        } // end if found our column
+        }
+        return false;
 }
-    
+
 /*
 echo "<p>testing</p>";
 echo "<pre>";
 
-//check_column('wp_links', 'link_description', 'mediumtext'); 
+//check_column('wp_links', 'link_description', 'mediumtext');
 //if (check_column($wpdb->comments, 'comment_author', 'tinytext'))
 //    echo "ok\n";
 $error_count = 0;
@@ -138 +138 @@
 // check the column
 if (!check_column($wpdb->links, 'link_description', 'varchar(255)'))
 {
-    $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
-    $q = $wpdb->query($ddl);
+        $ddl = "ALTER TABLE $wpdb->links MODIFY COLUMN link_description varchar(255) NOT NULL DEFAULT '' ";
+        $q = $wpdb->query($ddl);
 }
 if (check_column($wpdb->links, 'link_description', 'varchar(255)')) {
-    $res .= $tablename . ' - ok <br />';
+        $res .= $tablename . ' - ok <br />';
 } else {
-    $res .= 'There was a problem with ' . $tablename . '<br />';
-    ++$error_count;
+        $res .= 'There was a problem with ' . $tablename . '<br />';
+        ++$error_count;
 }
 echo "</pre>";
 */

wp-admin/install.php

@@ -1 +1 @@
 <?php
 define('WP_INSTALLING', true);
-if (!file_exists('../wp-config.php')) 
-    die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+if (!file_exists('../wp-config.php'))
+        die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
 
 require_once('../wp-config.php');
 require_once('./upgrade-functions.php');
@@ -62 +62 @@
                 text-align: right;
         }
         #footer {
-                text-align: center; 
-                border-top: 1px solid #ccc; 
-                padding-top: 1em; 
+                text-align: center;
+                border-top: 1px solid #ccc;
+                padding-top: 1em;
                 font-style: italic;
         }
         -->
@@ -104 +104 @@
 <tr>
 <th scope="row"  valign="top"> <?php __('Privacy:'); ?></th>
 <td><label><input type="checkbox" name="blog_public" value="1" checked="checked" /> <?php _e('I would like my blog to appear in search engines like Google and Technorati.'); ?></label></td>
-</tr> 
+</tr>
 </table>
 <p><em><?php _e('Double-check that email address before continuing.'); ?></em></p>
 <h2 class="step">

wp-admin/link-add.php

@@ -7 +7 @@
 
 
 wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image',
-                       'description', 'visible', 'target', 'category', 'link_id',
-                       'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
-                       'notes', 'linkcheck[]'));
+        'description', 'visible', 'target', 'category', 'link_id',
+        'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel',
+        'notes', 'linkcheck[]'));
 
 wp_enqueue_script( array('xfn', 'dbx-admin-key?pagenow=link.php') );
 if ( current_user_can( 'manage_categories' ) )

wp-admin/link-import.php

@@ -12 +12 @@
 ?>
 <?php
 switch ($step) {
-    case 0:
-    {
-        include_once('admin-header.php');
-        if ( !current_user_can('manage_links') )
-            die (__("Cheatin&#8217; uh?"));
+        case 0:
+        {
+                include_once('admin-header.php');
+                if ( !current_user_can('manage_links') )
+                        die (__("Cheatin&#8217; uh?"));
 
-        $opmltype = 'blogrolling'; // default.
+                $opmltype = 'blogrolling'; // default.
 ?>
 
 <div class="wrap">
@@ -60 +60 @@
 
 </div>
 <?php
-                break;
-            } // end case 0
+                break;
+        } // end case 0
 
-    case 1: {
+        case 1: {
                 check_admin_referer('import-bookmarks');
 
-                include_once('admin-header.php');
-                if ( !current_user_can('manage_links') )
-                    die (__("Cheatin' uh ?"));
+                include_once('admin-header.php');
+                if ( !current_user_can('manage_links') )
+                        die (__("Cheatin' uh ?"));
 ?>
 <div class="wrap">
 
-     <h2><?php _e('Importing...') ?></h2>
+         <h2><?php _e('Importing...') ?></h2>
 <?php
-                $cat_id = $_POST['cat_id'];
-                if (($cat_id == '') || ($cat_id == 0)) {
-                    $cat_id  = 1;
-                }
+                $cat_id = $_POST['cat_id'];
+                if (($cat_id == '') || ($cat_id == 0)) {
+                        $cat_id  = 1;
+                }
 
-                $opml_url = $_POST['opml_url'];
-                if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
-                                        $blogrolling = true;
-                }
-                else // try to get the upload file.
-                                {
-                                        $overrides = array('test_form' => false, 'test_type' => false);
-                                        $file = wp_handle_upload($_FILES['userfile'], $overrides);
+                $opml_url = $_POST['opml_url'];
+                if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
+                        $blogrolling = true;
+                }
+                else // try to get the upload file.
+                {
+                        $overrides = array('test_form' => false, 'test_type' => false);
+                        $file = wp_handle_upload($_FILES['userfile'], $overrides);
 
-                                        if ( isset($file['error']) )
-                                                die($file['error']);
+                        if ( isset($file['error']) )
+                                die($file['error']);
 
-                                        $url = $file['url'];
-                                        $opml_url = $file['file'];
-                                        $blogrolling = false;
-                                }
+                        $url = $file['url'];
+                        $opml_url = $file['file'];
+                        $blogrolling = false;
+                }
 
-                if (isset($opml_url) && $opml_url != '') {
-                    $opml = wp_remote_fopen($opml_url);
-                    include_once('link-parse-opml.php');
+                if (isset($opml_url) && $opml_url != '') {
+                        $opml = wp_remote_fopen($opml_url);
+                        include_once('link-parse-opml.php');
 
-                    $link_count = count($names);
-                    for ($i = 0; $i < $link_count; $i++) {
-                        if ('Last' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        if ('http' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);                               
-                                                wp_insert_link($link);
-                                                echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
-                    }
+                        $link_count = count($names);
+                        for ($i = 0; $i < $link_count; $i++) {
+                                if ('Last' == substr($titles[$i], 0, 4))
+                                        $titles[$i] = '';
+                                if ('http' == substr($titles[$i], 0, 4))
+                                        $titles[$i] = '';
+                                $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                                wp_insert_link($link);
+                                echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+                        }
 ?>
-     <p><?php printf(__('Inserted %1$d bookmarks into category %2$s. All done! Go <a href="%3$s">manage those bookmarks</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+                 <p><?php printf(__('Inserted %1$d bookmarks into category %2$s. All done! Go <a href="%3$s">manage those bookmarks</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
 <?php
-                } // end if got url
-                else
-                {
-                    echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
-                } // end else
+                } // end if got url
+                else
+                {
+                        echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
+                } // end else
 
                                 if ( ! $blogrolling )
                                         @unlink($opml_url);
 ?>
 </div>
 <?php
-                break;
-            } // end case 1
+                break;
+        } // end case 1
 } // end switch
 
 include('admin-footer.php');

wp-admin/link-manager.php

@@ -76 +76 @@
 <h2><?php _e('Bookmark Management'); ?></h2>
 <p><?php _e('Here you add links to sites that you visit often and share them on your blog. When you have a list of links in your sidebar to other blogs, it&#8217;s called a &#8220;blogroll.&#8221;'); ?></p>
 <form id="cats" method="get" action="">
-<p>Currently showing 
+<p>Currently showing
 <?php $categories = get_categories("hide_empty=1&type=link"); ?>
 <select name="cat_id">
 <option value="all" <?php echo ($cat_id == 'all') ? " selected='selected'" : ''; ?>><?php _e('All') ?></option>
@@ -85 +85 @@
 </option>
 <?php endforeach; ?>
 </select>
-bookmarks ordered by 
+bookmarks ordered by
 <select name="order_by">
 <option value="order_id" <?php if ($order_by == 'order_id') echo " selected='selected'";?>><?php _e('Bookmark ID') ?></option>
 <option value="order_name" <?php if ($order_by == 'order_name') echo " selected='selected'";?>><?php _e('Name') ?></option>
@@ -142 +142 @@
                 echo $link->link_description . "</td>";
                 echo "<td><a href=\"$link->link_url\" title=\"".sprintf(__('Visit %s'), $link->link_name)."\">$short_url</a></td>";
                 ?>
-        <td>
-        <?php
+                <td>
+                <?php
 
                 $cat_names = array();
                 foreach ($link->link_category as $category) {
@@ -156 +156 @@
                 echo implode(', ', $cat_names);
                 ?>
                 </td>
-        <td><?php echo $link->link_rel; ?></td>
-        <td align='center'><?php echo $visible; ?></td>
+                <td><?php echo $link->link_rel; ?></td>
+                <td align='center'><?php echo $visible; ?></td>
 <?php
 
                 echo '<td><a href="link.php?link_id='.$link->link_id.'&amp;action=edit" class="edit">'.__('Edit').'</a></td>';

wp-admin/link-parse-opml.php

@@ -4 +4 @@
 // columns we wish to find are:  link_url, link_name, link_target, link_description
 // we need to map XML attribute names to our columns
 $opml_map = array('URL'         => 'link_url',
-                  'HTMLURL'     => 'link_url',
-                  'TEXT'        => 'link_name',
-                  'TITLE'       => 'link_name',
-                  'TARGET'      => 'link_target',
-                  'DESCRIPTION' => 'link_description',
-                  'XMLURL'      => 'link_rss'
+        'HTMLURL'     => 'link_url',
+        'TEXT'        => 'link_name',
+        'TITLE'       => 'link_name',
+        'TARGET'      => 'link_target',
+        'DESCRIPTION' => 'link_description',
+        'XMLURL'      => 'link_rss'
 );
 
 $map = $opml_map;
@@ -20 +20 @@
  **/
 function startElement($parser, $tagName, $attrs) {
         global $updated_timestamp, $all_links, $map;
-    global $names, $urls, $targets, $descriptions, $feeds;
+        global $names, $urls, $targets, $descriptions, $feeds;
 
         if ($tagName == 'OUTLINE') {
-        foreach (array_keys($map) as $key) {
-            if (isset($attrs[$key])) {
-                $$map[$key] = $attrs[$key];
-            }
-        }
+                foreach (array_keys($map) as $key) {
+                        if (isset($attrs[$key])) {
+                                $$map[$key] = $attrs[$key];
+                        }
+                }
 
-        //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
+                //echo("got data: link_url = [$link_url], link_name = [$link_name], link_target = [$link_target], link_description = [$link_description]<br />\n");
 
-        // save the data away.
-        $names[] = $link_name;
-        $urls[] = $link_url;
-        $targets[] = $link_target;
+                // save the data away.
+                $names[] = $link_name;
+                $urls[] = $link_url;
+                $targets[] = $link_target;
                 $feeds[] = $link_rss;
-        $descriptions[] = $link_description;
-    } // end if outline
+                $descriptions[] = $link_description;
+        } // end if outline
 }
 
 /**
@@ -55 +55 @@
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
 if (!xml_parse($xml_parser, $opml, true)) {
-    echo(sprintf(__('XML error: %1$s at line %2$s'),
-                   xml_error_string(xml_get_error_code($xml_parser)),
-                   xml_get_current_line_number($xml_parser)));
+        echo(sprintf(__('XML error: %1$s at line %2$s'),
+        xml_error_string(xml_get_error_code($xml_parser)),
+        xml_get_current_line_number($xml_parser)));
 }
 
 // Free up memory used by the XML parser

wp-admin/link.php

@@ -29 +29 @@
                 $deleted = 0;
                 foreach ($linkcheck as $link_id) {
                         $link_id = (int) $link_id;
-                        
+
                         if ( wp_delete_link($link_id) )
                                 $deleted++;
                 }

wp-admin/list-manipulation-js.php

@@ -130 +130 @@
                                 }else if(inputs[a][i].tagName.match(/select/i)){
                                         this.inputData+='&'+inputs[a][i].name+'='+encodeURIComponent(inputs[a][i].options[inputs[a][i].selectedIndex].value);this.clearInputs.push(inputs[a][i].id);
                                 }
-                        }       
+                        }
                 }
         }
         this.getListPos=function(id,n){for(var i=0;i<listItems.length;i++){if(id==listItems[i]){var pos=i;break;}}if(!n){if(pos<this.recolorPos)this.recolorPos=pos;}return pos;}

wp-admin/menu-header.php

@@ -10 +10 @@
 
         // 0 = name, 1 = capability, 2 = file
         if (( strcmp($self, $item[2]) == 0 && empty($parent_file)) || ($parent_file && ($item[2] == $parent_file))) $class = ' class="current"';
-    
+
         if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) {
                 if ( file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") )
                         echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
@@ -27 +27 @@
 if ( isset($submenu["$parent_file"]) ) :
 ?>
 <ul id="submenu">
-<?php 
-foreach ($submenu["$parent_file"] as $item) : 
+<?php
+foreach ($submenu["$parent_file"] as $item) :
          if ( !current_user_can($item[1]) )
                  continue;
 
@@ -41 +41 @@
 $menu_hook = get_plugin_page_hook($item[2], $parent_file);
 
 if (file_exists(ABSPATH . "wp-content/plugins/{$item[2]}") || ! empty($menu_hook)) {
-        if ( 'admin.php' == $pagenow )
+        if ( 'admin.php' == $pagenow )
                 echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>";
         else
                 echo "\n\t<li><a href='" . get_settings('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>";
@@ -54 +54 @@
 </ul>
 <?php
 
-endif; 
+endif;
 
 do_action('admin_notices');
 

wp-admin/menu.php

@@ -78 +78 @@
                         unset($submenu[$parent][$index]);
                 }
         }
-        
+
         if ( empty($submenu[$parent]) )
                 unset($submenu[$parent]);
 }
@@ -86 +86 @@
 // Loop over the top-level menu.
 // Remove menus that have no accessible submenus and require privs that the user does not have.
 // Menus for which the original parent is not acessible due to lack of privs will have the next
-// submenu in line be assigned as the new menu parent. 
+// submenu in line be assigned as the new menu parent.
 foreach ( $menu as $id => $data ) {
         // If submenu is empty...
         if ( empty($submenu[$data[2]]) ) {
@@ -105 +105 @@
                 if ( $new_parent != $old_parent ) {
                         $real_parent_file[$old_parent] = $new_parent;
                         $menu[$id][2] = $new_parent;
-                        
+
                         foreach ($submenu[$old_parent] as $index => $data) {
                                 $submenu[$new_parent][$index] = $submenu[$old_parent][$index];
                                 unset($submenu[$old_parent][$index]);
                         }
-                        unset($submenu[$old_parent]);   
+                        unset($submenu[$old_parent]);
                 }
         }
 }

wp-admin/moderation.php

@@ -31 +31 @@
         foreach($comment as $key => $value) {
         if ($feelinglucky && 'later' == $value)
                 $value = 'delete';
-            switch($value) {
+                switch($value) {
                         case 'later':
                                 // do nothing with that comment
                                 // wp_set_comment_status($key, "hold");
@@ -41 +41 @@
                                 wp_set_comment_status($key, 'delete');
                                 ++$item_deleted;
                                 break;
-                        case 'spam':
-                                wp_set_comment_status($key, 'spam');
-                                ++$item_spam;
-                                break;
+                        case 'spam':
+                                wp_set_comment_status($key, 'spam');
+                                ++$item_spam;
+                                break;
                         case 'approve':
                                 wp_set_comment_status($key, 'approve');
                                 if ( get_settings('comments_notify') == true ) {
@@ -52 +52 @@
                                 }
                                 ++$item_approved;
                                 break;
-            }
+                }
         }
 
         $file = basename(__FILE__);
@@ -85 +85 @@
                         echo sprintf(__("%s comments deleted"), $deleted) . " <br/>\n";
                 }
         }
-        if ($spam) {
-                if ('1' == $spam) {
+        if ($spam) {
+                if ('1' == $spam) {
                         echo __("1 comment marked as spam") . " <br/>\n";
-                } else {
-                        echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
-                }
-        }
+                } else {
+                        echo sprintf(__("%s comments marked as spam"), $spam) . " <br/>\n";
+                }
+        }
         if ($ignored) {
                 if ('1' == $ignored) {
                         echo __("1 comment unchanged") . " <br/>\n";
@@ -113 +113 @@
         $comments = '';
 
 if ($comments) {
-    // list all comments that are waiting for approval
-    $file = basename(__FILE__);
+        // list all comments that are waiting for approval
+        $file = basename(__FILE__);
 ?>
-    <h2><?php _e('Moderation Queue') ?></h2>
-    <form name="approval" action="moderation.php" method="post">
-    <?php wp_nonce_field('moderate-comments') ?>
-    <input type="hidden" name="action" value="update" />
-    <ol id="the-comment-list" class="commentlist">
+        <h2><?php _e('Moderation Queue') ?></h2>
+        <form name="approval" action="moderation.php" method="post">
+        <?php wp_nonce_field('moderate-comments') ?>
+        <input type="hidden" name="action" value="update" />
+        <ol id="the-comment-list" class="commentlist">
 <?php
 $i = 0;
-    foreach($comments as $comment) {
-        ++$i;
-        $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date);
-        $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'");
-        if ($i % 2) $class = 'js-unapproved alternate';
-        else $class = 'js-unapproved';
-        echo "\n\t<li id='comment-$comment->comment_ID' class='$class'>"; 
+        foreach($comments as $comment) {
+                ++$i;
+                $comment_date = mysql2date(get_settings("date_format") . " @ " . get_settings("time_format"), $comment->comment_date);
+                $post_title = $wpdb->get_var("SELECT post_title FROM $wpdb->posts WHERE ID='$comment->comment_post_ID'");
+                if ($i % 2) $class = 'js-unapproved alternate';
+                else $class = 'js-unapproved';
+                echo "\n\t<li id='comment-$comment->comment_ID' class='$class'>";
         ?>
         <p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
 <?php comment_text() ?>
@@ -151 +151 @@
 
         </li>
 <?php
-    }
+        }
 ?>
-    </ol>
+        </ol>
 
 <div id="ajax-response"></div>
 
-    <p class="submit"><input type="submit" name="submit" value="<?php _e('Bulk Moderate Comments &raquo;') ?>" /></p>
+<p class="submit"><input type="submit" name="submit" value="<?php _e('Bulk Moderate Comments &raquo;') ?>" /></p>
 <script type="text/javascript">
 // <![CDATA[
 function markAllForDelete() {
@@ -197 +197 @@
                 <input name="feelinglucky" type="checkbox" id="feelinglucky" value="true" /> <label for="feelinglucky"><?php _e('Delete every comment marked "defer." <strong>Warning: This can&#8217;t be undone.</strong>'); ?></label>
         </p>
 </noscript>
-    </form>
+</form>
 <?php
 } else {
-    // nothing to approve
+        // nothing to approve
         echo '<p>'.__("Currently there are no comments for you to moderate.") . "</p>\n";
 }
 ?>

wp-admin/options-discussion.php

@@ -18 +18 @@
 }
 ?>
 
-<div class="wrap"> 
-<h2><?php _e('Discussion Options') ?></h2> 
-<form method="post" action="options.php"> 
+<div class="wrap">
+<h2><?php _e('Discussion Options') ?></h2>
+<form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <fieldset class="options">
-<legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend> 
-<ul> 
-<li> 
-<label for="default_pingback_flag"> 
-<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> /> 
-<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label> 
-</li> 
-<li> 
-<label for="default_ping_status"> 
-<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> /> 
-<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label> 
-</li> 
-<li> 
-<label for="default_comment_status"> 
-<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_settings('default_comment_status')); ?> /> 
-<?php _e('Allow people to post comments on the article') ?></label> 
-</li> 
-</ul> 
+<legend><?php _e('Usual settings for an article:<br /><small><em>(These settings may be overridden for individual articles.)</em></small>') ?></legend>
+<ul>
+<li>
+<label for="default_pingback_flag">
+<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_settings('default_pingback_flag')); ?> />
+<?php _e('Attempt to notify any Weblogs linked to from the article (slows down posting.)') ?></label>
+</li>
+<li>
+<label for="default_ping_status">
+<input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_settings('default_ping_status')); ?> />
+<?php _e('Allow link notifications from other Weblogs (pingbacks and trackbacks.)') ?></label>
+</li>
+<li>
+<label for="default_comment_status">
+<input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_settings('default_comment_status')); ?> />
+<?php _e('Allow people to post comments on the article') ?></label>
+</li>
+</ul>
 </fieldset>
 <fieldset class="options">
-<legend><?php _e('E-mail me whenever:') ?></legend> 
-<ul> 
-<li> 
-<label for="comments_notify"> 
-<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> /> 
-<?php _e('Anyone posts a comment') ?> </label> 
-</li> 
-<li> 
-<label for="moderation_notify"> 
-<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> /> 
-<?php _e('A comment is held for moderation') ?> </label> 
-</li> 
-</ul> 
+<legend><?php _e('E-mail me whenever:') ?></legend>
+<ul>
+<li>
+<label for="comments_notify">
+<input name="comments_notify" type="checkbox" id="comments_notify" value="1" <?php checked('1', get_settings('comments_notify')); ?> />
+<?php _e('Anyone posts a comment') ?> </label>
+</li>
+<li>
+<label for="moderation_notify">
+<input name="moderation_notify" type="checkbox" id="moderation_notify" value="1" <?php checked('1', get_settings('moderation_notify')); ?> />
+<?php _e('A comment is held for moderation') ?> </label>
+</li>
+</ul>
 </fieldset>
 <fieldset class="options">
-<legend><?php _e('Before a comment appears:') ?></legend> 
+<legend><?php _e('Before a comment appears:') ?></legend>
 <ul>
 <li>
-<label for="comment_moderation"> 
-<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> /> 
-<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label> 
-</li> 
-<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li> 
-<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li> 
-</ul> 
+<label for="comment_moderation">
+<input name="comment_moderation" type="checkbox" id="comment_moderation" value="1" <?php checked('1', get_settings('comment_moderation')); ?> />
+<?php _e('An administrator must approve the comment (regardless of any matches below)') ?> </label>
+</li>
+<li><label for="require_name_email"><input type="checkbox" name="require_name_email" id="require_name_email" value="1" <?php checked('1', get_settings('require_name_email')); ?> /> <?php _e('Comment author must fill out name and e-mail') ?></label></li>
+<li><label for="comment_whitelist"><input type="checkbox" name="comment_whitelist" id="comment_whitelist" value="1" <?php checked('1', get_settings('comment_whitelist')); ?> /> <?php _e('Comment author must have a previously approved comment') ?></label></li>
+</ul>
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Moderation') ?></legend>
 <p><?php printf(__('Hold a comment in the queue if it contains more than %s links. (A common characteristic of comment spam is a large number of hyperlinks.)'), '<input name="comment_max_links" type="text" id="comment_max_links" size="3" value="' . get_settings('comment_max_links'). '" />' ) ?></p>
 
 <p><?php _e('When a comment contains any of these words in its content, name, URI, e-mail, or IP, hold it in the moderation queue: (Separate multiple words with new lines.) <a href="http://codex.wordpress.org/Spam_Words">Common spam words</a>.') ?></p>
-<p> 
-<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea> 
-</p> 
 <p>
+<textarea name="moderation_keys" cols="60" rows="4" id="moderation_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('moderation_keys'); ?></textarea>
+</p>
+<p>
 <a id="retrospambutton" href="options-discussion.php?action=retrospam"><?php _e('Check past comments against moderation list'); ?></a>
-</p> 
+</p>
 </fieldset>
 <fieldset class="options">
 <legend><?php _e('Comment Blacklist') ?></legend>
 <p><?php _e('This is a list of words that you want completely blacklisted from your blog. Be very careful what you add here, because if a comment matches something here it will be completely nuked and there will be no notification. Remember that partial words can match, so if there is any chance something here might match it would be better to put it in the moderation box above.') ?></p>
-<p> 
-<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea> 
+<p>
+<textarea name="blacklist_keys" cols="60" rows="4" id="blacklist_keys" style="width: 98%; font-size: 12px;" class="code"><?php form_option('blacklist_keys'); ?></textarea>
 </p>
-<p><label for="open_proxy_check"> 
-<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> /> 
+<p><label for="open_proxy_check">
+<input name="open_proxy_check" type="checkbox" id="open_proxy_check" value="1" <?php checked('1', get_settings('open_proxy_check')); ?> />
 <?php _e('Blacklist comments from open and insecure proxies.') ?></label></p>
 </fieldset>
 <p class="submit">
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,open_proxy_check" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options') ?>" /> 
-</p> 
-</form> 
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="page_options" value="default_pingback_flag,default_ping_status,default_comment_status,comments_notify,moderation_notify,comment_moderation,require_name_email,comment_whitelist,comment_max_links,moderation_keys,blacklist_keys,open_proxy_check" />
+<input type="submit" name="Submit" value="<?php _e('Update Options') ?>" />
+</p>
+</form>
 </div>
 <?php include('./admin-footer.php'); ?>

wp-admin/options-general.php

@@ -6 +6 @@
 
 include('./admin-header.php');
 ?>
- 
+
 <div class="wrap">
 <h2><?php _e('General Options') ?></h2>
-<form method="post" action="options.php"> 
+<form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<table class="optiontable"> 
-<tr valign="top"> 
-<th scope="row"><?php _e('Weblog title:') ?></th> 
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('Tagline:') ?></th> 
+<table class="optiontable">
+<tr valign="top">
+<th scope="row"><?php _e('Weblog title:') ?></th>
+<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" size="40" /></td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('Tagline:') ?></th>
 <td><input name="blogdescription" type="text" id="blogdescription" style="width: 95%" value="<?php form_option('blogdescription'); ?>" size="45" />
 <br />
-<?php _e('In a few words, explain what this weblog is about.') ?></td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('WordPress address (URI):') ?></th> 
-<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td> 
-</tr> 
+<?php _e('In a few words, explain what this weblog is about.') ?></td>
+</tr>
 <tr valign="top">
+<th scope="row"><?php _e('WordPress address (URI):') ?></th>
+<td><input name="siteurl" type="text" id="siteurl" value="<?php form_option('siteurl'); ?>" size="40" class="code" /></td>
+</tr>
+<tr valign="top">
 <th scope="row"><?php _e('Blog address (URI):') ?></th>
 <td><input name="home" type="text" id="home" value="<?php form_option('home'); ?>" size="40" class="code" /><br /><?php _e('If you want your blog homepage <a href="http://codex.wordpress.org/Giving_WordPress_Its_Own_Directory">to be different than the directory</a> you installed WordPress in, enter that address here.'); ?></td>
 </tr>
-<tr valign="top"> 
-<th scope="row"><?php _e('E-mail address:') ?> </th> 
+<tr valign="top">
+<th scope="row"><?php _e('E-mail address:') ?> </th>
 <td><input name="admin_email" type="text" id="admin_email" value="<?php form_option('admin_email'); ?>" size="40" class="code" />
 <br />
-<?php _e('This address is used only for admin purposes.') ?></td> 
+<?php _e('This address is used only for admin purposes.') ?></td>
 </tr>
-<tr valign="top"> 
-<th scope="row"><?php _e('Membership:') ?></th> 
-<td> <label for="users_can_register"> 
-<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> /> 
+<tr valign="top">
+<th scope="row"><?php _e('Membership:') ?></th>
+<td> <label for="users_can_register">
+<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_settings('users_can_register')); ?> />
 <?php _e('Anyone can register') ?></label><br />
 <label for="comment_registration">
-<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> /> 
+<input name="comment_registration" type="checkbox" id="comment_registration" value="1" <?php checked('1', get_settings('comment_registration')); ?> />
 <?php _e('Users must be registered and logged in to comment') ?>
 </label>
-</td> 
-</tr> 
-<tr valign="top"> 
-<th scope="row"><?php _e('New User Default Role:') ?></th> 
-<td><label for="default_role"> 
+</td>
+</tr>
+<tr valign="top">
+<th scope="row"><?php _e('New User Default Role:') ?></th>
+<td><label for="default_role">
 <select name="default_role" id="default_role"><?php wp_dropdown_roles( get_settings('default_role') ); ?></select></label>
-</td> 
-</tr> 
-</table> 
-<fieldset class="options"> 
-<legend><?php _e('Date and Time') ?></legend> 
-<table class="optiontable"> 
-<tr> 
-<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th> 
-<td><code><?php echo gmdate('Y-m-d g:i:s a'); ?></code></td> 
+</td>
 </tr>
+</table>
+<fieldset class="options">
+<legend><?php _e('Date and Time') ?></legend>
+<table class="optiontable">
 <tr>
+<th scope="row"><?php _e('<abbr title="Coordinated Universal Time">UTC</abbr> time is:') ?> </th>
+<td><code><?php echo gmdate('Y-m-d g:i:s a'); ?></code></td>
+</tr>
+<tr>
 <th scope="row"><?php _e('Times in the weblog should differ by:') ?> </th>
-<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" /> 
+<td><input name="gmt_offset" type="text" id="gmt_offset" size="2" value="<?php form_option('gmt_offset'); ?>" />
 <?php _e('hours') ?> </td>
 </tr>
 <tr>
@@ -75 +75 @@
 <th scope="row"><?php _e('Default time format:') ?></th>
 <td><input name="time_format" type="text" id="time_format" size="30" value="<?php form_option('time_format'); ?>" /><br />
 <?php _e('Output:') ?> <strong><?php echo gmdate(get_settings('time_format'), current_time('timestamp')); ?></strong></td>
-</tr> 
+</tr>
 <tr>
 <th scope="row">&nbsp;</th>
 <td><?php _e('<a href="http://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date formatting</a>. Save option to update sample output.') ?> </td>
@@ -92 +92 @@
 </select></td>
 </tr>
 </table>
-</fieldset> 
+</fieldset>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="blogname,blogdescription,siteurl,admin_email,users_can_register,gmt_offset,date_format,time_format,home,start_of_week,comment_registration,default_role,blog_public" /> 
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="page_options" value="blogname,blogdescription,siteurl,admin_email,users_can_register,gmt_offset,date_format,time_format,home,start_of_week,comment_registration,default_role,blog_public" />
 </p>
 </form>
 
-</div> 
+</div>
 
 <?php include('./admin-footer.php') ?>

wp-admin/options-misc.php

@@ -7 +7 @@
 include('admin-header.php');
 
 ?>
- 
-<div class="wrap"> 
-<h2><?php _e('Miscellaneous Options') ?></h2> 
+
+<div class="wrap">
+<h2><?php _e('Miscellaneous Options') ?></h2>
 <form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 <fieldset class="options">
@@ -42 +42 @@
 
 <p class="submit">
 <input type="hidden" name="action" value="update" />
-<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" /> 
+<input type="hidden" name="page_options" value="hack_file,use_linksupdate,uploads_use_yearmonth_folders,upload_path" />
 <input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
-</form> 
+</form>
 </div>
 
 <?php include('./admin-footer.php'); ?>
+ No newline at end of file

wp-admin/options-permalink.php

@@ -96 +96 @@
 if ($writable)
         _e('Permalink structure updated.');
 else
-        _e('You should update your .htaccess now.'); 
+        _e('You should update your .htaccess now.');
 ?></p></div>
 <?php endif; ?>
 
-<div class="wrap"> 
-  <h2><?php _e('Customize Permalink Structure') ?></h2> 
-  <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
+<div class="wrap">
+        <h2><?php _e('Customize Permalink Structure') ?></h2>
+        <p><?php _e('By default WordPress uses web URIs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URI structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="http://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p>
 
 <?php
 $prefix = '';
@@ -116 +116 @@
         $prefix . '/archives/%post_id%'
         );
 ?>
-<form name="form" action="options-permalink.php" method="post"> 
+<form name="form" action="options-permalink.php" method="post">
 <?php wp_nonce_field('update-permalink') ?>
 <h3><?php _e('Common options:'); ?></h3>
 <p>
         <label>
-<input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> /> 
-<?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
-   </label>
+                <input name="selection" type="radio" value="" class="tog" <?php checked('', $permalink_structure); ?> />
+                <?php _e('Default'); ?><br /> <span> &raquo; <code><?php echo get_settings('home'); ?>/?p=123</code></span>
+        </label>
 </p>
 <p>
         <label>
-<input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> 
-<?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
-   </label>
+                <input name="selection" type="radio" value="<?php echo $structures[1]; ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> />
+                <?php _e('Date and name based'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></span>
+        </label>
 </p>
 <p>
         <label>
-<input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> 
-<?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
-   </label>
+                <input name="selection" type="radio" value="<?php echo $structures[2]; ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> />
+                <?php _e('Numeric'); ?><br /> <span> &raquo; <code><?php echo get_settings('home') . $prefix  ; ?>/archives/123</code></span>
+        </label>
 </p>
 <p>
 <label>
@@ -143 +143 @@
 <?php if ( !in_array($permalink_structure, $structures) ) { ?>
 checked="checked"
 <?php } ?>
- /> 
+ />
 <?php _e('Custom, specify below'); ?>
 </label>
 <br />
@@ -156 +156 @@
 <?php else : ?>
         <p><?php _e('If you like, you may enter a custom prefix for your category URIs here. For example, <code>/index.php/taxonomy/tags</code> would make your category links like <code>http://example.org/index.php/taxonomy/tags/uncategorized/</code>. If you leave this blank the default will be used.') ?></p>
 <?php endif; ?>
-        <p> 
-  <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" /> 
-     </p> 
-    <p class="submit"> 
-      <input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" /> 
-    </p> 
-  </form> 
+        <p>
+                <?php _e('Category base'); ?>: <input name="category_base" type="text" class="code"  value="<?php echo $category_base; ?>" size="30" />
+        </p>
+        <p class="submit">
+                <input type="submit" name="submit" value="<?php _e('Update Permalink Structure &raquo;') ?>" />
+        </p>
+        </form>
 <?php if ( $permalink_structure && !$usingpi && !$writable ) : ?>
-  <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Make_a_Directory_Writable">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
-<form action="options-permalink.php" method="post">
-<?php wp_nonce_field('update-permalink') ?>
-   <p>
-<textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?>
-</textarea>
-    </p>
+        <p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Make_a_Directory_Writable">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
+                <form action="options-permalink.php" method="post">
+                <?php wp_nonce_field('update-permalink') ?>
+        <p>
+                <textarea rows="5" style="width: 98%;" name="rules"><?php echo $wp_rewrite->mod_rewrite_rules(); ?>
+                </textarea>
+        </p>
 </form>
 <?php endif; ?>
 

wp-admin/options-privacy.php

@@ -6 +6 @@
 
 include('./admin-header.php');
 ?>
- 
+
 <div class="wrap">
 <h2><?php _e('Privacy Options') ?></h2>
-<form method="post" action="options.php"> 
+<form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<table class="optiontable"> 
-<tr valign="top"> 
-<th scope="row"><?php _e('Blog visibility:') ?> </th> 
+<table class="optiontable">
+<tr valign="top">
+<th scope="row"><?php _e('Blog visibility:') ?> </th>
 <td>
 <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
 <label for="blog-public">I would like my blog to be visible to anyone who visits, including search engines and archivers</label>
@@ -21 +21 @@
 <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
 <label for="blog-norobots">I would like to block search engines, but allow normal folks</label>
 <?php do_action('blog_privacy_selector'); ?>
-</td> 
+</td>
 </tr>
-</table> 
+</table>
 
 <p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="blog_public" /> 
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="page_options" value="blog_public" />
 </p>
 </form>
 
-</div> 
+</div>
 
 <?php include('./admin-footer.php') ?>

wp-admin/options-reading.php

@@ -7 +7 @@
 include('admin-header.php');
 ?>
 
-<div class="wrap"> 
-<h2><?php _e('Reading Options') ?></h2> 
+<div class="wrap">
+<h2><?php _e('Reading Options') ?></h2>
 <form name="form1" method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
 
 <?php if ( get_pages() ): ?>
-<fieldset class="options"> 
-<legend><?php _e('Front Page') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Front page displays:')?></th> 
+<fieldset class="options">
+<legend><?php _e('Front Page') ?></legend>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Front page displays:')?></th>
 <td>
         <label>
-                <input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> /> 
+                <input name="show_on_front" type="radio" value="posts" class="tog" <?php checked('posts', get_option('show_on_front')); ?> />
                 <?php _e('The latest posts'); ?>
         </label>
         <br />
         <label>
-                <input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> /> 
+                <input name="show_on_front" type="radio" value="page" class="tog" <?php checked('page', get_option('show_on_front')); ?> />
                 <?php printf(__('A static <a href="%s">page</a> (select below)'), 'edit-pages.php'); ?>
         </label>
 <ul>
@@ -40 +40 @@
 </div>
 <?php endif; ?>
 </fieldset>
-</td> 
-</tr> 
-</table> 
+</td>
+</tr>
+</table>
 </fieldset>
 <?php endif; ?>
 
-<fieldset class="options"> 
-<legend><?php _e('Blog Pages') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Show at most:') ?></th> 
+<fieldset class="options">
+<legend><?php _e('Blog Pages') ?></legend>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Show at most:') ?></th>
 <td>
-<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" /> 
-<select name="what_to_show" id="what_to_show" > 
-<option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option> 
-<option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option> 
+<input name="posts_per_page" type="text" id="posts_per_page" value="<?php form_option('posts_per_page'); ?>" size="3" />
+<select name="what_to_show" id="what_to_show" >
+<option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option>
+<option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option>
 </select>
-</td> 
-</tr> 
-</table> 
-</fieldset> 
+</td>
+</tr>
+</table>
+</fieldset>
 
-<fieldset class="options"> 
-<legend><?php _e('Syndication Feeds') ?></legend> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Show the most recent:') ?></th> 
-<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td> 
+<fieldset class="options">
+<legend><?php _e('Syndication Feeds') ?></legend>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Show the most recent:') ?></th>
+<td><input name="posts_per_rss" type="text" id="posts_per_rss" value="<?php form_option('posts_per_rss'); ?>" size="3" /> <?php _e('posts') ?></td>
 </tr>
 <tr valign="top">
 <th scope="row"><?php _e('For each article, show:') ?> </th>
@@ -75 +75 @@
 <label><input name="rss_use_excerpt"  type="radio" value="0" <?php checked(0, get_settings('rss_use_excerpt')); ?>      /> <?php _e('Full text') ?></label><br />
 <label><input name="rss_use_excerpt" type="radio" value="1" <?php checked(1, get_settings('rss_use_excerpt')); ?> /> <?php _e('Summary') ?></label>
 </td>
-</tr> 
-</table> 
-</fieldset> 
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th> 
+</tr>
+</table>
+</fieldset>
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
+<tr valign="top">
+<th width="33%" scope="row"><?php _e('Encoding for pages and feeds:') ?></th>
 <td><input name="blog_charset" type="text" id="blog_charset" value="<?php form_option('blog_charset'); ?>" size="20" class="code" /><br />
-<?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td> 
+<?php _e('The character encoding you write your blog in (UTF-8 is <a href="http://developer.apple.com/documentation/macos8/TextIntlSvcs/TextEncodingConversionManager/TEC1.5/TEC.b0.html">recommended</a>)') ?></td>
 </tr>
-</table> 
+</table>
 <p>
-<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> /> 
+<label><input type="checkbox" name="gzipcompression" value="1" <?php checked('1', get_settings('gzipcompression')); ?> />
 <?php _e('WordPress should compress articles (gzip) if browsers ask for them') ?></label>
 </p>
 <p class="submit">
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
-</p> 
-</form> 
-</div> 
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="page_options" value="posts_per_page,what_to_show,posts_per_rss,rss_use_excerpt,blog_charset,gzipcompression,show_on_front,page_on_front,page_for_posts" />
+<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
+</p>
+</form>
+</div>
 <?php include('./admin-footer.php'); ?>
+ No newline at end of file

wp-admin/options-writing.php

@@ -7 +7 @@
 include('admin-header.php');
 ?>
 
-<div class="wrap"> 
-<h2><?php _e('Writing Options') ?></h2> 
-<form method="post" action="options.php"> 
+<div class="wrap">
+<h2><?php _e('Writing Options') ?></h2>
+<form method="post" action="options.php">
 <?php wp_nonce_field('update-options') ?>
-<table width="100%" cellspacing="2" cellpadding="5" class="editform"> 
-<tr valign="top"> 
-<th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th> 
-<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " /> 
-<?php _e('lines') ?></td> 
-</tr> 
+<table width="100%" cellspacing="2" cellpadding="5" class="editform">
 <tr valign="top">
+<th width="33%" scope="row"> <?php _e('Size of the post box:') ?></th>
+<td><input name="default_post_edit_rows" type="text" id="default_post_edit_rows" value="<?php form_option('default_post_edit_rows'); ?>" size="2" style="width: 1.5em; " />
+<?php _e('lines') ?></td>
+</tr>
+<tr valign="top">
 <th scope="row"><?php _e('Formatting:') ?></th>
 <td>
 <label for="rich_editing">
@@ -64 +64 @@
 <tr valign="top">
 <th scope="row"><?php _e('Mail server:') ?></th>
 <td><input name="mailserver_url" type="text" id="mailserver_url" value="<?php form_option('mailserver_url'); ?>" size="40" />
-<label for="mailserver_port"><?php _e('Port:') ?></label> 
+<label for="mailserver_port"><?php _e('Port:') ?></label>
 <input name="mailserver_port" type="text" id="mailserver_port" value="<?php form_option('mailserver_port'); ?>" size="6" />
 </td>
 </tr>
@@ -102 +102 @@
 </fieldset>
 
 <p class="submit">
-<input type="hidden" name="action" value="update" /> 
-<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" /> 
-<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /> 
+<input type="hidden" name="action" value="update" />
+<input type="hidden" name="page_options" value="default_post_edit_rows,use_smilies,rich_editing,ping_sites,mailserver_url,mailserver_port,mailserver_login,mailserver_pass,default_category,default_email_category,use_balanceTags,default_link_category" />
+<input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" />
 </p>
-</form> 
-</div> 
+</form>
+</div>
 
 <?php include('./admin-footer.php') ?>
+ No newline at end of file

wp-admin/options.php

@@ -48 +48 @@
                         }
                 }
         }
-    
+
         if ($any_changed) {
                         // If siteurl or home changed, reset cookies.
                         if ( get_settings('siteurl') != $old_siteurl || get_settings('home') != $old_home ) {
@@ -61 +61 @@
                         }
 
                         //$message = sprintf(__('%d setting(s) saved... '), $any_changed);
-    }
-    
+        }
+
         $referred = remove_query_arg('updated' , wp_get_referer());
         $goback = add_query_arg('updated', 'true', wp_get_referer());
         $goback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $goback);
         wp_redirect($goback);
-    break;
+        break;
 
 default:
         include('admin-header.php'); ?>
 
 <div class="wrap">
-  <h2><?php _e('All options'); ?></h2>
-  <form name="form" action="options.php" method="post">
-  <?php wp_nonce_field('update-options') ?>
-  <input type="hidden" name="action" value="update" />
-  <table width="98%">
+        <h2><?php _e('All options'); ?></h2>
+        <form name="form" action="options.php" method="post">
+        <?php wp_nonce_field('update-options') ?>
+        <input type="hidden" name="action" value="update" />
+        <table width="98%">
 <?php
 $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
 
@@ -91 +91 @@
 </tr>";
 endforeach;
 ?>
-  </table>
+        </table>
 <p class="submit"><input type="submit" name="Update" value="<?php _e('Update Settings &raquo;') ?>" /></p>
-  </form>
+        </form>
 </div>
 
 

wp-admin/page-new.php

@@ -20 +20 @@
 }
 ?>
 
-<?php include('admin-footer.php'); ?> 
- No newline at end of file
+<?php include('admin-footer.php'); ?>
+ No newline at end of file

wp-admin/page.php

@@ -116 +116 @@
                 if ( ! wp_delete_attachment($page_id) )
                         die( __('Error in deleting...') );
         } else {
-                if ( !wp_delete_post($page_id) ) 
+                if ( !wp_delete_post($page_id) )
                         die( __('Error in deleting...') );
         }
 

wp-admin/plugin-editor.php

@@ -60 +60 @@
 <?php if (isset($_GET['a'])) : ?>
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif; ?>
- <div class="wrap"> 
-  <?php
+ <div class="wrap">
+        <?php
         if (is_writeable($real_file)) {
                 echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), $file) . '</h2>';
         } else {
@@ -74 +74 @@
 <?php
 if ($plugin_files) :
 ?>
-  <ul>
-<?php foreach($plugin_files as $plugin_file) : ?>
+        <ul>
+        <?php foreach($plugin_files as $plugin_file) : ?>
                  <li><a href="plugin-editor.php?file=<?php echo "$plugin_file"; ?>"><?php echo $plugins[$plugin_file]['Name']; ?></a></li>
-<?php endforeach; ?>
-  </ul>
+        <?php endforeach; ?>
+        </ul>
 <?php endif; ?>
 </div>
-        <?php   if (!$error) { ?> 
-  <form name="template" id="template" action="plugin-editor.php" method="post">
-  <?php wp_nonce_field('edit-plugin_' . $file) ?>
-                 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
+<?php   if (!$error) { ?>
+        <form name="template" id="template" action="plugin-editor.php" method="post">
+        <?php wp_nonce_field('edit-plugin_' . $file) ?>
+                <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+                <input type="hidden" name="action" value="update" />
+                <input type="hidden" name="file" value="<?php echo $file ?>" />
                 </div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
-<?php
-        echo "<input type='submit' name='submit' value='        " . __('Update File &raquo;') . "' tabindex='2' />";
-?>
-</p>
+        <p class="submit">
+        <?php
+                echo "<input type='submit' name='submit' value='        " . __('Update File &raquo;') . "' tabindex='2' />";
+        ?>
+        </p>
 <?php else : ?>
-<p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
+        <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+ </form>
+<?php
         } else {
                 echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
         }
-        ?>
+?>
 <div class="clear"> &nbsp; </div>
-</div> 
+</div>
 <?php
 break;
 }
 
-include("admin-footer.php") ?> 
+include("admin-footer.php") ?>

wp-admin/post-new.php

@@ -60 +60 @@
 <?php
 if ($is_NS4 || $is_gecko) {
 ?>
-<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a> 
+<a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}location.href='<?php echo get_settings('siteurl') ?>/wp-admin/post-new.php?text='+encodeURIComponent(Q)+'&amp;popupurl='+encodeURIComponent(location.href)+'&amp;popuptitle='+encodeURIComponent(document.title);"><?php printf(__('Press It - %s'), wp_specialchars(get_settings('blogname'))); ?></a>
 <?php
 } else if ($is_winIE) {
 ?>
@@ -75 +75 @@
 <br />
 <br />
 <?php _e('One-click bookmarklet:') ?><br />
-<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a> 
+<a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
 <?php
 } else if ($is_opera) {
 ?>
-<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
+<a href="javascript:location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/post-new.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
 <?php
 } else if ($is_macIE) {
 ?>
-<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a> 
+<a href="javascript:Q='';location.href='<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title);"><?php printf(__('Press it - %s'), get_settings('blogname')); ?></a>
 <?php
 }
 ?>

wp-admin/post.php

@@ -15 +15 @@
         $parent_file = 'post-new.php';
         $submenu_file = 'post-new.php';
         check_admin_referer('add-post');
-        
+
         $post_ID = 'post' == $action ? write_post() : edit_post();
 
         // Redirect.
@@ -86 +86 @@
 case 'editpost':
         $post_ID = (int) $_POST['post_ID'];
         check_admin_referer('update-post_' . $post_ID);
-        
+
         $post_ID = edit_post();
 
         if ($_POST['save']) {
@@ -123 +123 @@
                 if ( ! wp_delete_attachment($post_id) )
                         die( __('Error in deleting...') );
         } else {
-                if ( !wp_delete_post($post_id) ) 
+                if ( !wp_delete_post($post_id) )
                         die( __('Error in deleting...') );
         }
 

wp-admin/profile.php

@@ -1 @@
-<?php 
+<?php
 require_once('admin.php');
 
 $title = __('Profile');
@@ -117 +117 @@
 
 <?php do_action('profile_personal_options'); ?>
 
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
-    <?php
-    if(count($profileuser->caps) > count($profileuser->roles)):
-    ?>
-    <tr>
-      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
-      <td><?php 
+        <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
+                <?php
+                if(count($profileuser->caps) > count($profileuser->roles)):
+                ?>
+                <tr>
+                        <th scope="row"><?php _e('Additional Capabilities:') ?></th>
+                        <td><?php
                         $output = '';
                         foreach($profileuser->caps as $cap => $value) {
                                 if(!$wp_roles->is_role($cap)) {
@@ -133 +133 @@
                         }
                         echo $output;
                         ?></td>
-    </tr>
-    <?php
-    endif;
-    ?>
-  </table>
+                </tr>
+                <?php
+                endif;
+                ?>
+        </table>
 <p class="submit">
 <input type="submit" value="<?php _e('Update Profile &raquo;') ?>" name="submit" />
 </p>

wp-admin/setup-config.php

@@ -2 +2 @@
 define('WP_INSTALLING', true);
 
 if (!file_exists('../wp-config-sample.php'))
-    die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
+        die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.');
 
 $configFile = file('../wp-config-sample.php');
 
@@ -82 +82 @@
 
 switch($step) {
         case 0:
-?> 
+?>
 
-<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p> 
-<ol> 
-  <li>Database name</li> 
-  <li>Database username</li> 
-  <li>Database password</li>
-  <li>Database host</li> 
-  <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
-</ol> 
+<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
+<ol>
+        <li>Database name</li>
+        <li>Database username</li>
+        <li>Database password</li>
+        <li>Database host</li>
+        <li>Table prefix (if you want to run more than one WordPress in a single database) </li>
+</ol>
 <p><strong>If for any reason this automatic file creation doesn't work, don't worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>. </strong></p>
 <p>In all likelihood, these items were supplied to you by your ISP. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready, <a href="setup-config.php?step=1">let&#8217;s go</a>! </p>
 <?php
         break;
 
         case 1:
-        ?> 
-</p> 
+        ?>
+</p>
 <form method="post" action="setup-config.php?step=2">
-  <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
-  <table> 
-    <tr> 
-      <th scope="row">Database Name</th> 
-      <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
-      <td>The name of the database you want to run WP in. </td> 
-    </tr> 
-    <tr> 
-      <th scope="row">User Name</th> 
-      <td><input name="uname" type="text" size="25" value="username" /></td>
-      <td>Your MySQL username</td> 
-    </tr> 
-    <tr> 
-      <th scope="row">Password</th> 
-      <td><input name="pwd" type="text" size="25" value="password" /></td>
-      <td>...and MySQL password.</td> 
-    </tr> 
-    <tr> 
-      <th scope="row">Database Host</th> 
-      <td><input name="dbhost" type="text" size="25" value="localhost" /></td>
-      <td>99% chance you won't need to change this value.</td> 
-    </tr>
-    <tr>
-      <th scope="row">Table Prefix</th>
-      <td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
-      <td>If you want to run multiple WordPress installations in a single database, change this.</td>
-    </tr> 
-  </table>
-  <h2 class="step">
-  <input name="submit" type="submit" value="Submit" />
-  </h2>
-</form> 
+        <p>Below you should enter your database connection details. If you're not sure about these, contact your host. </p>
+        <table>
+                <tr>
+                        <th scope="row">Database Name</th>
+                        <td><input name="dbname" type="text" size="25" value="wordpress" /></td>
+                        <td>The name of the database you want to run WP in. </td>
+                </tr>
+                <tr>
+                        <th scope="row">User Name</th>
+                        <td><input name="uname" type="text" size="25" value="username" /></td>
+                        <td>Your MySQL username</td>
+                </tr>
+                <tr>
+                        <th scope="row">Password</th>
+                        <td><input name="pwd" type="text" size="25" value="password" /></td>
+                        <td>...and MySQL password.</td>
+                </tr>
+                <tr>
+                        <th scope="row">Database Host</th>
+                        <td><input name="dbhost" type="text" size="25" value="localhost" /></td>
+                        <td>99% chance you won't need to change this value.</td>
+                </tr>
+                <tr>
+                        <th scope="row">Table Prefix</th>
+                        <td><input name="prefix" type="text" id="prefix" value="wp_" size="25" /></td>
+                        <td>If you want to run multiple WordPress installations in a single database, change this.</td>
+                </tr>
+        </table>
+        <h2 class="step">
+        <input name="submit" type="submit" value="Submit" />
+        </h2>
+</form>
 <?php
         break;
 
         case 2:
         $dbname  = trim($_POST['dbname']);
-    $uname   = trim($_POST['uname']);
-    $passwrd = trim($_POST['pwd']);
-    $dbhost  = trim($_POST['dbhost']);
+        $uname   = trim($_POST['uname']);
+        $passwrd = trim($_POST['pwd']);
+        $dbhost  = trim($_POST['dbhost']);
         $prefix  = trim($_POST['prefix']);
         if (empty($prefix)) $prefix = 'wp_';
 
-    // Test the db connection.
-    define('DB_NAME', $dbname);
-    define('DB_USER', $uname);
-    define('DB_PASSWORD', $passwrd);
-    define('DB_HOST', $dbhost);
+        // Test the db connection.
+        define('DB_NAME', $dbname);
+        define('DB_USER', $uname);
+        define('DB_PASSWORD', $passwrd);
+        define('DB_HOST', $dbhost);
 
-    // We'll fail here if the values are no good.
-    require_once('../wp-includes/wp-db.php');
+        // We'll fail here if the values are no good.
+        require_once('../wp-includes/wp-db.php');
         $handle = fopen('../wp-config.php', 'w');
 
-    foreach ($configFile as $line_num => $line) {
-        switch (substr($line,0,16)) {
-            case "define('DB_NAME'":
-                fwrite($handle, str_replace("wordpress", $dbname, $line));
-                break;
-            case "define('DB_USER'":
-                fwrite($handle, str_replace("'username'", "'$uname'", $line));
-                break;
-            case "define('DB_PASSW":
-                fwrite($handle, str_replace("'password'", "'$passwrd'", $line));
-                break;
-            case "define('DB_HOST'":
-                fwrite($handle, str_replace("localhost", $dbhost, $line));
-                break;
+        foreach ($configFile as $line_num => $line) {
+                switch (substr($line,0,16)) {
+                        case "define('DB_NAME'":
+                                fwrite($handle, str_replace("wordpress", $dbname, $line));
+                                break;
+                        case "define('DB_USER'":
+                                fwrite($handle, str_replace("'username'", "'$uname'", $line));
+                                break;
+                        case "define('DB_PASSW":
+                                fwrite($handle, str_replace("'password'", "'$passwrd'", $line));
+                                break;
+                        case "define('DB_HOST'":
+                                fwrite($handle, str_replace("localhost", $dbhost, $line));
+                                break;
                         case '$table_prefix  =':
                                 fwrite($handle, str_replace('wp_', $prefix, $line));
                                 break;
-            default:
-                fwrite($handle, $line);
-        }
-    }
-    fclose($handle);
+                        default:
+                                fwrite($handle, $line);
+                }
+        }
+        fclose($handle);
         chmod('../wp-config.php', 0666);
-?> 
-<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p> 
+?>
+<p>All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to <a href="install.php">run the install!</a></p>
 <?php
         break;
 }

wp-admin/sidebar.php

@@ -34 +34 @@
         padding: 3px;
 }
 .sidebar-categories {
-    display: block;
-    height: 6.6em;
-    overflow: auto;
-    background-color: #f4f4f4;
+        display: block;
+        height: 6.6em;
+        overflow: auto;
+        background-color: #f4f4f4;
 }
 .sidebar-categories label {
         font-size: 10px;
-    display: block;
-    width: 90%;
+        display: block;
+        width: 90%;
 }
 </style>
 </head>
@@ -65 +65 @@
 <textarea rows="8" cols="12" style="width: 100%" name="content" tabindex="2"></textarea>
 </p>
 <p>
-    <input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="Save as Draft" /> 
+        <input name="saveasdraft" type="submit" id="saveasdraft" tabindex="9" value="Save as Draft" />
 <?php if ( current_user_can('publish_posts') ) : ?>
-    <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="Publish" /> 
+        <input name="publish" type="submit" id="publish" tabindex="6" style="font-weight: bold;" value="Publish" />
 <?php endif; ?>
 </p>
 </div>

wp-admin/templates.php

@@ -78 +78 @@
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
         <?php endif; ?>
 <?php endif; ?>
- <div class="wrap"> 
+ <div class="wrap">
 <?php
 if (is_writeable($real_file)) {
         echo '<h2>' . sprintf(__('Editing <strong>%s</strong>'), wp_specialchars($file) ) . '</h2>';
@@ -87 +87 @@
 }
 ?>
 <div id="templateside">
-<?php 
-if ( $recents ) : 
+<?php
+if ( $recents ) :
 ?>
 <h3><?php _e('Recent'); ?></h3>
 <?php
@@ -106 +106 @@
          if (file_exists(ABSPATH . $old_file))
                  $common_files[] = $old_file;
  } ?>
-  <ul>
-         <?php foreach ($common_files as $common_file) : ?>
-          <li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
-         <?php endforeach; ?>
-  </ul>
+<ul>
+        <?php foreach ($common_files as $common_file) : ?>
+                <li><a href="templates.php?file=<?php echo $common_file?>"><?php echo get_file_description($common_file); ?></a></li>
+        <?php endforeach; ?>
+</ul>
 </div>
 <?php if (!$error) { ?>
-  <form name="template" id="template" action="templates.php" method="post"> 
-  <?php wp_nonce_field('edit-file_' . $file) ?>
-     <div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-</div>
+        <form name="template" id="template" action="templates.php" method="post">
+        <?php wp_nonce_field('edit-file_' . $file) ?>
+                <div><textarea cols="70" rows="25" name="newcontent" id='newcontent' tabindex="1"><?php echo $content ?></textarea>
+                <input type="hidden" name="action" value="update" />
+                <input type="hidden" name="file" value="<?php echo $file ?>" />
+                </div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
+        <p class="submit">
 <?php
         echo "<input type='submit' name='submit' value='        " . __('Update File &raquo;') . "' tabindex='2' />";
 ?>
@@ -128 +128 @@
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+        </form>
+        <?php
         } else {
                 echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
         }
@@ -139 +139 @@
 <div class="wrap">
 <h2><?php _e('Other Files') ?></h2>
 
-  <p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p> 
-  <form name="file" action="templates.php" method="get"> 
-    <input type="text" name="file" /> 
-    <input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" /> 
-  </form> 
+        <p><?php _e('To edit a file, type its name here. You can edit any file <a href="http://codex.wordpress.org/Changing_File_Permissions" title="Read more about making files writable">writable by the server</a>, e.g. CHMOD 666.') ?></p>
+        <form name="file" action="templates.php" method="get">
+                <input type="text" name="file" />
+                <input type="submit" name="submit"  value="<?php _e('Edit file &raquo;') ?>" />
+        </form>
 
-  <p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
-</div> 
+        <p><?php _e('Note: of course, you can also edit the files/templates in your text editor of choice and upload them. This online editor is only meant to be used when you don&#8217;t have access to a text editor or FTP client.') ?></p>
+</div>
 <?php
 
 break;

wp-admin/theme-editor.php

@@ -75 +75 @@
  <div id="message" class="updated fade"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif; ?>
  <div class="wrap">
-  <form name="theme" action="theme-editor.php" method="post"> 
+        <form name="theme" action="theme-editor.php" method="post">
                 <?php _e('Select theme to edit:') ?>
                 <select name="theme" id="theme">
         <?php
@@ -87 +87 @@
                 echo "\n\t<option value=\"$theme_name\" $selected>$theme_name</option>";
         }
 ?>
- </select>
- <input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" />
- </form>
- </div>
+</select>
+<input type="submit" name="Submit" value="<?php _e('Select &raquo;') ?>" />
+</form>
+</div>
 
- <div class="wrap"> 
-  <?php
+ <div class="wrap">
+        <?php
         if ( is_writeable($real_file) ) {
                 echo '<h2>' . sprintf(__('Editing <code>%s</code>'), $file_show) . '</h2>';
         } else {
@@ -101 +101 @@
         }
         ?>
         <div id="templateside">
-  <h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
+        <h3><?php printf(__("<strong>'%s'</strong> theme files"), $theme) ?></h3>
 
 <?php
 if ($allowed_files) :
 ?>
-  <ul>
+        <ul>
 <?php foreach($allowed_files as $allowed_file) : ?>
                  <li><a href="theme-editor.php?file=<?php echo "$allowed_file"; ?>&amp;theme=<?php echo urlencode($theme) ?>"><?php echo get_file_description($allowed_file); ?></a></li>
 <?php endforeach; ?>
-  </ul>
+        </ul>
 <?php endif; ?>
-</div> 
+</div>
         <?php
         if (!$error) {
-        ?> 
-  <form name="template" id="template" action="theme-editor.php" method="post">
-  <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
-                 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea> 
-     <input type="hidden" name="action" value="update" /> 
-     <input type="hidden" name="file" value="<?php echo $file ?>" /> 
-     <input type="hidden" name="theme" value="<?php echo $theme ?>" />
+        ?>
+        <form name="template" id="template" action="theme-editor.php" method="post">
+        <?php wp_nonce_field('edit-theme_' . $file . $theme) ?>
+                 <div><textarea cols="70" rows="25" name="newcontent" id="newcontent" tabindex="1"><?php echo $content ?></textarea>
+                 <input type="hidden" name="action" value="update" />
+                 <input type="hidden" name="file" value="<?php echo $file ?>" />
+                 <input type="hidden" name="theme" value="<?php echo $theme ?>" />
                  </div>
 <?php if ( is_writeable($real_file) ) : ?>
-     <p class="submit">
+        <p class="submit">
 <?php
         echo "<input type='submit' name='submit' value='        " . __('Update File &raquo;') . "' tabindex='2' />";
 ?>
@@ -132 +132 @@
 <?php else : ?>
 <p><em><?php _e('If this file were writable you could edit it.'); ?></em></p>
 <?php endif; ?>
-   </form> 
-  <?php
+        </form>
+        <?php
         } else {
                 echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></div>';
         }
         ?>
 <div class="clear"> &nbsp; </div>
-</div> 
+</div>
 <?php
 break;
 }
 
-include("admin-footer.php") ?> 
+include("admin-footer.php") ?>

wp-admin/themes.php

@@ -112 +112 @@
 
                 $theme = ('class="alternate"' == $theme) ? '' : 'class="alternate"';
                 echo "
-          <tr $theme>
-             <td>$title</td>
-             <td>$description</td>
-          </tr>";
+                <tr $theme>
+                         <td>$title</td>
+                         <td>$description</td>
+                </tr>";
         }
 ?>
 </table>

wp-admin/update-links.php

@@ -28 +28 @@
         while ( !feof($fs) )
                 $response .= fgets($fs, 1160); // One TCP-IP packet
         fclose($fs);
-    
+
         $response = explode("\r\n\r\n", $response, 2);
         $body = trim( $response[1] );
         $body = str_replace(array("\r\n", "\r"), "\n", $body);
-    
+
         $returns = explode("\n", $body);
-    
+
         foreach ($returns as $return) :
                 $time = $wpdb->escape( substr($return, 0, 19) );
                 $uri = $wpdb->escape( preg_replace('/(.*?) | (.*?)/', '$2', $return) );

wp-admin/upgrade-functions.php

@@ -121 +121 @@
 http://wordpress.org/
 "), $blog_url, $name, $password);
 
-        @wp_mail($email, __('New WordPress Blog'), $message, $message_headers); 
+        @wp_mail($email, __('New WordPress Blog'), $message, $message_headers);
 }
 endif;
 
@@ -138 +138 @@
         wp_cache_flush();
         make_db_current_silent();
         upgrade_all();
-        wp_cache_flush();       
+        wp_cache_flush();
 }
 endif;
 
@@ -188 +188 @@
         $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''");
         if ($posts) {
                 foreach($posts as $post) {
-                        if ('' == $post->post_name) { 
+                        if ('' == $post->post_name) {
                                 $newtitle = sanitize_title($post->post_title);
                                 $wpdb->query("UPDATE $wpdb->posts SET post_name = '$newtitle' WHERE ID = '$post->ID'");
                         }
@@ -197 +197 @@
 
         $categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
         foreach ($categories as $category) {
-                if ('' == $category->category_nicename) { 
+                if ('' == $category->category_nicename) {
                         $newtitle = sanitize_title($category->cat_name);
                         $wpdb->query("UPDATE $wpdb->categories SET category_nicename = '$newtitle' WHERE cat_ID = '$category->cat_ID'");
                 }
@@ -252 +252 @@
 function upgrade_110() {
         global $wpdb;
 
-    // Set user_nicename.
+        // Set user_nicename.
         $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
-        foreach ($users as $user) {
-                if ('' == $user->user_nicename) { 
-                        $newname = sanitize_title($user->user_nickname);
-                        $wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
-                }
-        }
+        foreach ($users as $user) {
+                if ('' == $user->user_nicename) {
+                        $newname = sanitize_title($user->user_nickname);
+                        $wpdb->query("UPDATE $wpdb->users SET user_nicename = '$newname' WHERE ID = '$user->ID'");
+                }
+        }
 
         $users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
         foreach ($users as $row) {
                 if (!preg_match('/^[A-Fa-f0-9]{32}$/', $row->user_pass)) {
-                           $wpdb->query('UPDATE '.$wpdb->users.' SET user_pass = MD5(\''.$row->user_pass.'\') WHERE ID = \''.$row->ID.'\'');
+                        $wpdb->query('UPDATE '.$wpdb->users.' SET user_pass = MD5(\''.$row->user_pass.'\') WHERE ID = \''.$row->ID.'\'');
                 }
         }
 
@@ -306 +306 @@
 }
 
 function upgrade_130() {
-    global $wpdb;
+        global $wpdb;
 
-    // Remove extraneous backslashes.
+        // Remove extraneous backslashes.
         $posts = $wpdb->get_results("SELECT ID, post_title, post_content, post_excerpt, guid, post_date, post_name, post_status, post_author FROM $wpdb->posts");
         if ($posts) {
                 foreach($posts as $post) {
-            $post_content = addslashes(deslash($post->post_content));
-            $post_title = addslashes(deslash($post->post_title));
-            $post_excerpt = addslashes(deslash($post->post_excerpt));
+                        $post_content = addslashes(deslash($post->post_content));
+                        $post_title = addslashes(deslash($post->post_title));
+                        $post_excerpt = addslashes(deslash($post->post_excerpt));
                         if ( empty($post->guid) )
                                 $guid = get_permalink($post->ID);
                         else
                                 $guid = $post->guid;
 
-            $wpdb->query("UPDATE $wpdb->posts SET post_title = '$post_title', post_content = '$post_content', post_excerpt = '$post_excerpt', guid = '$guid' WHERE ID = '$post->ID'");
+                        $wpdb->query("UPDATE $wpdb->posts SET post_title = '$post_title', post_content = '$post_content', post_excerpt = '$post_excerpt', guid = '$guid' WHERE ID = '$post->ID'");
                 }
         }
 
-    // Remove extraneous backslashes.
+        // Remove extraneous backslashes.
         $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_content FROM $wpdb->comments");
         if ($comments) {
                 foreach($comments as $comment) {
-            $comment_content = addslashes(deslash($comment->comment_content));
-            $comment_author = addslashes(deslash($comment->comment_author));
-            $wpdb->query("UPDATE $wpdb->comments SET comment_content = '$comment_content', comment_author = '$comment_author' WHERE comment_ID = '$comment->comment_ID'");
+                        $comment_content = addslashes(deslash($comment->comment_content));
+                        $comment_author = addslashes(deslash($comment->comment_author));
+                        $wpdb->query("UPDATE $wpdb->comments SET comment_content = '$comment_content', comment_author = '$comment_author' WHERE comment_ID = '$comment->comment_ID'");
                 }
         }
 
-    // Remove extraneous backslashes.
+        // Remove extraneous backslashes.
         $links = $wpdb->get_results("SELECT link_id, link_name, link_description FROM $wpdb->links");
         if ($links) {
                 foreach($links as $link) {
-            $link_name = addslashes(deslash($link->link_name));
-            $link_description = addslashes(deslash($link->link_description));
-            $wpdb->query("UPDATE $wpdb->links SET link_name = '$link_name', link_description = '$link_description' WHERE link_id = '$link->link_id'");
+                        $link_name = addslashes(deslash($link->link_name));
+                        $link_description = addslashes(deslash($link->link_description));
+                        $wpdb->query("UPDATE $wpdb->links SET link_name = '$link_name', link_description = '$link_description' WHERE link_id = '$link->link_id'");
                 }
         }
 
-    // The "paged" option for what_to_show is no more.
-    if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
-        $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
-    }
+        // The "paged" option for what_to_show is no more.
+        if ($wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'what_to_show'") == 'paged') {
+                $wpdb->query("UPDATE $wpdb->options SET option_value = 'posts' WHERE option_name = 'what_to_show'");
+        }
 
-                $active_plugins = __get_option('active_plugins');
+        $active_plugins = __get_option('active_plugins');
 
-                // If plugins are not stored in an array, they're stored in the old
-                // newline separated format.  Convert to new format.
-                if ( !is_array( $active_plugins ) ) {
-                        $active_plugins = explode("\n", trim($active_plugins));
-                        update_option('active_plugins', $active_plugins);
-                }
+        // If plugins are not stored in an array, they're stored in the old
+        // newline separated format.  Convert to new format.
+        if ( !is_array( $active_plugins ) ) {
+                $active_plugins = explode("\n", trim($active_plugins));
+                update_option('active_plugins', $active_plugins);
+        }
 
         // Obsolete tables
         $wpdb->query('DROP TABLE IF EXISTS ' . $wpdb->prefix . 'optionvalues');
@@ -500 +500 @@
                 // Give future posts a post_status of future.
                 $now = gmdate('Y-m-d H:i:59');
                 $wpdb->query ("UPDATE $wpdb->posts SET post_status = 'future' WHERE post_status = 'publish' AND post_date_gmt > '$now'");
-                
+
                 $posts = $wpdb->get_results("SELECT ID, post_date FROM $wpdb->posts WHERE post_status ='future'");
                 if ( !empty($posts) )
                         foreach ( $posts as $post )
@@ -509 +509 @@
         if ( $wp_current_db_version < 3570 ) {
                 // Create categories for link categories if a category with the same
                 // name doesn't exist.  Create a map of link cat IDs to cat IDs.
-                $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");  
+                $link_cats = $wpdb->get_results("SELECT cat_id, cat_name FROM $wpdb->linkcategories");
                 foreach ( $link_cats as $link_cat) {
                         if ( $cat_id = category_exists($link_cat->cat_name) ) {
                                 $link_cat_id_map[$link_cat->cat_id] = $cat_id;
@@ -528 +528 @@
                         if (!$cat && 0 != $link->link_category) {
                                 $wpdb->query("INSERT INTO $wpdb->link2cat (link_id, category_id)
                                         VALUES ('$link->link_id', '$link_cat')");
-                        }                       
+                        }
                 }
-                
+
                 // Set default to the last category we grabbed during the upgrade loop.
                 update_option('default_link_category', $default_link_cat);
 
@@ -549 +549 @@
 
 // General
 function maybe_create_table($table_name, $create_ddl) {
-    global $wpdb;
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
-        if ($table == $table_name) {
-            return true;
-        }
-    }
-    return false;
+        global $wpdb;
+        foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+                if ($table == $table_name) {
+                        return true;
+                }
+        }
+        //didn't find it try to create it.
+        $q = $wpdb->query($create_ddl);
+        // we cannot directly tell that whether this succeeded!
+        foreach ($wpdb->get_col("SHOW TABLES",0) as $table ) {
+                if ($table == $table_name) {
+                        return true;
+                }
+        }
+        return false;
 }
 
 function drop_index($table, $index) {
@@ -592 +592 @@
  **           false on error
  */
 function maybe_add_column($table_name, $column_name, $create_ddl) {
-    global $wpdb, $debug;
-    foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-        if ($debug) echo("checking $column == $column_name<br />");
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    //didn't find it try to create it.
-    $q = $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
-    foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
-        if ($column == $column_name) {
-            return true;
-        }
-    }
-    return false;
+        global $wpdb, $debug;
+        foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+                if ($debug) echo("checking $column == $column_name<br />");
+                if ($column == $column_name) {
+                        return true;
+                }
+        }
+        //didn't find it try to create it.
+        $q = $wpdb->query($create_ddl);
+        // we cannot directly tell that whether this succeeded!
+        foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
+                if ($column == $column_name) {
+                        return true;
+                }
+        }
+        return false;
 }
 
 
@@ -616 +616 @@
         global $wpdb;
         if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options")) {
                 foreach ($options as $option) {
-                        // "When trying to design a foolproof system, 
+                        // "When trying to design a foolproof system,
                         //  never underestimate the ingenuity of the fools :)" -- Dougal
                         if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
                         if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
@@ -647 +647 @@
 }
 
 function deslash($content) {
-    // Note: \\\ inside a regex denotes a single backslash.
+        // Note: \\\ inside a regex denotes a single backslash.
 
-    // Replace one or more backslashes followed by a single quote with
-    // a single quote.
-    $content = preg_replace("/\\\+'/", "'", $content);
+        // Replace one or more backslashes followed by a single quote with
+        // a single quote.
+        $content = preg_replace("/\\\+'/", "'", $content);
 
-    // Replace one or more backslashes followed by a double quote with
-    // a double quote.
-    $content = preg_replace('/\\\+"/', '"', $content);
+        // Replace one or more backslashes followed by a double quote with
+        // a double quote.
+        $content = preg_replace('/\\\+"/', '"', $content);
 
-    // Replace one or more backslashes with one backslash.
-    $content = preg_replace("/\\\+/", "\\", $content);
+        // Replace one or more backslashes with one backslash.
+        $content = preg_replace("/\\\+/", "\\", $content);
 
-    return $content;
+        return $content;
 }
 
 function dbDelta($queries, $execute = true) {
@@ -827 +827 @@
                                                                 $index_columns .= '('.$column_data['subpart'].')';
                                                         }
                                                 }
-                                                // Add the column list to the index create string 
+                                                // Add the column list to the index create string
                                                 $index_string .= ' ('.$index_columns.')';
 
                                                 if(!(($aindex = array_search($index_string, $indices)) === false)) {

wp-admin/upgrade-schema.php

@@ -2 +2 @@
 // Here we keep the DB structure and option values
 
 $wp_queries="CREATE TABLE $wpdb->categories (
-  cat_ID bigint(20) NOT NULL auto_increment,
-  cat_name varchar(55) NOT NULL default '',
-  category_nicename varchar(200) NOT NULL default '',
-  category_description longtext NOT NULL,
-  category_parent bigint(20) NOT NULL default '0',
-  category_count bigint(20) NOT NULL default '0',
-  link_count bigint(20) NOT NULL default '0',
-  posts_private tinyint(1) NOT NULL default '0',
-  links_private tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (cat_ID),
-  KEY category_nicename (category_nicename)
+        cat_ID bigint(20) NOT NULL auto_increment,
+        cat_name varchar(55) NOT NULL default '',
+        category_nicename varchar(200) NOT NULL default '',
+        category_description longtext NOT NULL,
+        category_parent bigint(20) NOT NULL default '0',
+        category_count bigint(20) NOT NULL default '0',
+        link_count bigint(20) NOT NULL default '0',
+        posts_private tinyint(1) NOT NULL default '0',
+        links_private tinyint(1) NOT NULL default '0',
+        PRIMARY KEY  (cat_ID),
+        KEY category_nicename (category_nicename)
 );
 CREATE TABLE $wpdb->comments (
-  comment_ID bigint(20) unsigned NOT NULL auto_increment,
-  comment_post_ID int(11) NOT NULL default '0',
-  comment_author tinytext NOT NULL,
-  comment_author_email varchar(100) NOT NULL default '',
-  comment_author_url varchar(200) NOT NULL default '',
-  comment_author_IP varchar(100) NOT NULL default '',
-  comment_date datetime NOT NULL default '0000-00-00 00:00:00',
-  comment_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  comment_content text NOT NULL,
-  comment_karma int(11) NOT NULL default '0',
-  comment_approved enum('0','1','spam') NOT NULL default '1',
-  comment_agent varchar(255) NOT NULL default '',
-  comment_type varchar(20) NOT NULL default '',
-  comment_parent bigint(20) NOT NULL default '0',
-  user_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (comment_ID),
-  KEY comment_approved (comment_approved),
-  KEY comment_post_ID (comment_post_ID)
+        comment_ID bigint(20) unsigned NOT NULL auto_increment,
+        comment_post_ID int(11) NOT NULL default '0',
+        comment_author tinytext NOT NULL,
+        comment_author_email varchar(100) NOT NULL default '',
+        comment_author_url varchar(200) NOT NULL default '',
+        comment_author_IP varchar(100) NOT NULL default '',
+        comment_date datetime NOT NULL default '0000-00-00 00:00:00',
+        comment_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
+        comment_content text NOT NULL,
+        comment_karma int(11) NOT NULL default '0',
+        comment_approved enum('0','1','spam') NOT NULL default '1',
+        comment_agent varchar(255) NOT NULL default '',
+        comment_type varchar(20) NOT NULL default '',
+        comment_parent bigint(20) NOT NULL default '0',
+        user_id bigint(20) NOT NULL default '0',
+        PRIMARY KEY  (comment_ID),
+        KEY comment_approved (comment_approved),
+        KEY comment_post_ID (comment_post_ID)
 );
 CREATE TABLE $wpdb->link2cat (
-  rel_id bigint(20) NOT NULL auto_increment,
-  link_id bigint(20) NOT NULL default '0',
-  category_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (rel_id),
-  KEY link_id (link_id,category_id)
+        rel_id bigint(20) NOT NULL auto_increment,
+        link_id bigint(20) NOT NULL default '0',
+        category_id bigint(20) NOT NULL default '0',
+        PRIMARY KEY  (rel_id),
+        KEY link_id (link_id,category_id)
 );
 CREATE TABLE $wpdb->links (
-  link_id bigint(20) NOT NULL auto_increment,
-  link_url varchar(255) NOT NULL default '',
-  link_name varchar(255) NOT NULL default '',
-  link_image varchar(255) NOT NULL default '',
-  link_target varchar(25) NOT NULL default '',
-  link_category bigint(20) NOT NULL default '0',
-  link_description varchar(255) NOT NULL default '',
-  link_visible enum('Y','N') NOT NULL default 'Y',
-  link_owner int(11) NOT NULL default '1',
-  link_rating int(11) NOT NULL default '0',
-  link_updated datetime NOT NULL default '0000-00-00 00:00:00',
-  link_rel varchar(255) NOT NULL default '',
-  link_notes mediumtext NOT NULL,
-  link_rss varchar(255) NOT NULL default '',
-  PRIMARY KEY  (link_id),
-  KEY link_category (link_category),
-  KEY link_visible (link_visible)
+        link_id bigint(20) NOT NULL auto_increment,
+        link_url varchar(255) NOT NULL default '',
+        link_name varchar(255) NOT NULL default '',
+        link_image varchar(255) NOT NULL default '',
+        link_target varchar(25) NOT NULL default '',
+        link_category bigint(20) NOT NULL default '0',
+        link_description varchar(255) NOT NULL default '',
+        link_visible enum('Y','N') NOT NULL default 'Y',
+        link_owner int(11) NOT NULL default '1',
+        link_rating int(11) NOT NULL default '0',
+        link_updated datetime NOT NULL default '0000-00-00 00:00:00',
+        link_rel varchar(255) NOT NULL default '',
+        link_notes mediumtext NOT NULL,
+        link_rss varchar(255) NOT NULL default '',
+        PRIMARY KEY  (link_id),
+        KEY link_category (link_category),
+        KEY link_visible (link_visible)
 );
 CREATE TABLE $wpdb->options (
-  option_id bigint(20) NOT NULL auto_increment,
-  blog_id int(11) NOT NULL default '0',
-  option_name varchar(64) NOT NULL default '',
-  option_can_override enum('Y','N') NOT NULL default 'Y',
-  option_type int(11) NOT NULL default '1',
-  option_value longtext NOT NULL,
-  option_width int(11) NOT NULL default '20',
-  option_height int(11) NOT NULL default '8',
-  option_description tinytext NOT NULL,
-  option_admin_level int(11) NOT NULL default '1',
-  autoload enum('yes','no') NOT NULL default 'yes',
-  PRIMARY KEY  (option_id,blog_id,option_name),
-  KEY option_name (option_name)
+        option_id bigint(20) NOT NULL auto_increment,
+        blog_id int(11) NOT NULL default '0',
+        option_name varchar(64) NOT NULL default '',
+        option_can_override enum('Y','N') NOT NULL default 'Y',
+        option_type int(11) NOT NULL default '1',
+        option_value longtext NOT NULL,
+        option_width int(11) NOT NULL default '20',
+        option_height int(11) NOT NULL default '8',
+        option_description tinytext NOT NULL,
+        option_admin_level int(11) NOT NULL default '1',
+        autoload enum('yes','no') NOT NULL default 'yes',
+        PRIMARY KEY  (option_id,blog_id,option_name),
+        KEY option_name (option_name)
 );
 CREATE TABLE $wpdb->post2cat (
-  rel_id bigint(20) NOT NULL auto_increment,
-  post_id bigint(20) NOT NULL default '0',
-  category_id bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (rel_id),
-  KEY post_id (post_id,category_id)
+        rel_id bigint(20) NOT NULL auto_increment,
+        post_id bigint(20) NOT NULL default '0',
+        category_id bigint(20) NOT NULL default '0',
+        PRIMARY KEY  (rel_id),
+        KEY post_id (post_id,category_id)
 );
 CREATE TABLE $wpdb->postmeta (
-  meta_id bigint(20) NOT NULL auto_increment,
-  post_id bigint(20) NOT NULL default '0',
-  meta_key varchar(255) default NULL,
-  meta_value longtext,
-  PRIMARY KEY  (meta_id),
-  KEY post_id (post_id),
-  KEY meta_key (meta_key)
+        meta_id bigint(20) NOT NULL auto_increment,
+        post_id bigint(20) NOT NULL default '0',
+        meta_key varchar(255) default NULL,
+        meta_value longtext,
+        PRIMARY KEY  (meta_id),
+        KEY post_id (post_id),
+        KEY meta_key (meta_key)
 );
 CREATE TABLE $wpdb->posts (
-  ID bigint(20) unsigned NOT NULL auto_increment,
-  post_author bigint(20) NOT NULL default '0',
-  post_date datetime NOT NULL default '0000-00-00 00:00:00',
-  post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  post_content longtext NOT NULL,
-  post_title text NOT NULL,
-  post_category int(4) NOT NULL default '0',
-  post_excerpt text NOT NULL,
-  post_status enum('publish','draft','private','static','object','attachment','inherit','future') NOT NULL default 'publish',
-  comment_status enum('open','closed','registered_only') NOT NULL default 'open',
-  ping_status enum('open','closed') NOT NULL default 'open',
-  post_password varchar(20) NOT NULL default '',
-  post_name varchar(200) NOT NULL default '',
-  to_ping text NOT NULL,
-  pinged text NOT NULL,
-  post_modified datetime NOT NULL default '0000-00-00 00:00:00',
-  post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
-  post_content_filtered text NOT NULL,
-  post_parent bigint(20) NOT NULL default '0',
-  guid varchar(255) NOT NULL default '',
-  menu_order int(11) NOT NULL default '0',
-  post_type varchar(20) NOT NULL default 'post',
-  post_mime_type varchar(100) NOT NULL default '',
-  comment_count bigint(20) NOT NULL default '0',
-  PRIMARY KEY  (ID),
-  KEY post_name (post_name),
-  KEY type_status_date (post_type, post_status, post_date, ID)
+        ID bigint(20) unsigned NOT NULL auto_increment,
+        post_author bigint(20) NOT NULL default '0',
+        post_date datetime NOT NULL default '0000-00-00 00:00:00',
+        post_date_gmt datetime NOT NULL default '0000-00-00 00:00:00',
+        post_content longtext NOT NULL,
+        post_title text NOT NULL,
+        post_category int(4) NOT NULL default '0',
+        post_excerpt text NOT NULL,
+        post_status enum('publish','draft','private','static','object','attachment','inherit','future') NOT NULL default 'publish',
+        comment_status enum('open','closed','registered_only') NOT NULL default 'open',
+        ping_status enum('open','closed') NOT NULL default 'open',
+        post_password varchar(20) NOT NULL default '',
+        post_name varchar(200) NOT NULL default '',
+        to_ping text NOT NULL,
+        pinged text NOT NULL,
+        post_modified datetime NOT NULL default '0000-00-00 00:00:00',
+        post_modified_gmt datetime NOT NULL default '0000-00-00 00:00:00',
+        post_content_filtered text NOT NULL,
+        post_parent bigint(20) NOT NULL default '0',
+        guid varchar(255) NOT NULL default '',
+        menu_order int(11) NOT NULL default '0',
+        post_type varchar(20) NOT NULL default 'post',
+        post_mime_type varchar(100) NOT NULL default '',
+        comment_count bigint(20) NOT NULL default '0',
+        PRIMARY KEY  (ID),
+        KEY post_name (post_name),
+        KEY type_status_date (post_type, post_status, post_date, ID)
 );
 CREATE TABLE $wpdb->users (
-  ID bigint(20) unsigned NOT NULL auto_increment,
-  user_login varchar(60) NOT NULL default '',
-  user_pass varchar(64) NOT NULL default '',
-  user_nicename varchar(50) NOT NULL default '',
-  user_email varchar(100) NOT NULL default '',
-  user_url varchar(100) NOT NULL default '',
-  user_registered datetime NOT NULL default '0000-00-00 00:00:00',
-  user_activation_key varchar(60) NOT NULL default '',
-  user_status int(11) NOT NULL default '0',
-  display_name varchar(250) NOT NULL default '',
-  PRIMARY KEY  (ID),
-  KEY user_login_key (user_login)
+        ID bigint(20) unsigned NOT NULL auto_increment,
+        user_login varchar(60) NOT NULL default '',
+        user_pass varchar(64) NOT NULL default '',
+        user_nicename varchar(50) NOT NULL default '',
+        user_email varchar(100) NOT NULL default '',
+        user_url varchar(100) NOT NULL default '',
+        user_registered datetime NOT NULL default '0000-00-00 00:00:00',
+        user_activation_key varchar(60) NOT NULL default '',
+        user_status int(11) NOT NULL default '0',
+        display_name varchar(250) NOT NULL default '',
+        PRIMARY KEY  (ID),
+        KEY user_login_key (user_login)
 );
 CREATE TABLE $wpdb->usermeta (
-  umeta_id bigint(20) NOT NULL auto_increment,
-  user_id bigint(20) NOT NULL default '0',
-  meta_key varchar(255) default NULL,
-  meta_value longtext,
-  PRIMARY KEY  (umeta_id),
-  KEY user_id (user_id),
-  KEY meta_key (meta_key)
+        umeta_id bigint(20) NOT NULL auto_increment,
+        user_id bigint(20) NOT NULL default '0',
+        meta_key varchar(255) default NULL,
+        meta_value longtext,
+        PRIMARY KEY  (umeta_id),
+        KEY user_id (user_id),
+        KEY meta_key (meta_key)
 );";
 
 function populate_options() {
@@ -224 +224 @@
                 add_option('uploads_use_yearmonth_folders', 1);
                 add_option('upload_path', 'wp-content/uploads');
         }
-        
+
         // 2.0.3
         add_option('secret', md5(uniqid(microtime())));
 

wp-admin/upgrade.php

@@ -68 +68 @@
 
         case 0:
         $goback = wp_specialchars(wp_get_referer());
-?> 
-<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p> 
+?>
+<p><?php _e('This file upgrades you from any previous version of WordPress to the latest. It may take a while though, so be patient.'); ?></p>
         <h2 class="step"><a href="upgrade.php?step=1&amp;backto=<?php echo $goback; ?>"><?php _e('Upgrade WordPress &raquo;'); ?></a></h2>
 <?php
         break;
@@ -81 +81 @@
                 $backto = __get_option('home');
         else
                 $backto = wp_specialchars( $_GET['backto'] , 1 );
-?> 
-<h2><?php _e('Step 1'); ?></h2> 
+?>
+<h2><?php _e('Step 1'); ?></h2>
         <p><?php printf(__("There's actually only one step. So if you see this, you're done. <a href='%s'>Have fun</a>!"),  $backto); ?></p>
 
 <!--
@@ -96 +96 @@
 <?php
         break;
 }
-?> 
+?>
 </body>
 </html>

wp-admin/user-edit.php

@@ -182 +182 @@
 <?php do_action('edit_user_profile'); ?>
 
 <br clear="all" />
-  <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
-    <?php
-    if(count($profileuser->caps) > count($profileuser->roles)):
-    ?>
-    <tr>
-      <th scope="row"><?php _e('Additional Capabilities:') ?></th>
-      <td><?php 
+        <table width="99%"  border="0" cellspacing="2" cellpadding="3" class="editform">
+                <?php
+                if(count($profileuser->caps) > count($profileuser->roles)):
+                ?>
+                <tr>
+                        <th scope="row"><?php _e('Additional Capabilities:') ?></th>
+                        <td><?php
                         $output = '';
                         foreach($profileuser->caps as $cap => $value) {
                                 if(!$wp_roles->is_role($cap)) {
@@ -198 +198 @@
                         }
                         echo $output;
                         ?></td>
-    </tr>
-    <?php
-    endif;
-    ?>
-  </table>
+                </tr>
+                <?php
+                endif;
+                ?>
+        </table>
 <p class="submit">
         <input type="hidden" name="action" value="update" />
         <input type="hidden" name="user_id" id="user_id" value="<?php echo $user_id; ?>" />
-    <input type="submit" value="<?php _e('Update User &raquo;') ?>" name="submit" />
+        <input type="submit" value="<?php _e('Update User &raquo;') ?>" name="submit" />
  </p>
 </form>
 </div>

wp-admin/wp-admin.css

@@ -258 +258 @@
 }
 
 .commentlist li {
-        border-bottom: 1px solid #ccc; 
+        border-bottom: 1px solid #ccc;
         padding: 1em 1em .2em;
         margin: 0;
 }
@@ -762 +762 @@
 }
 
 /* A handy div class for hiding controls.
-   Some browsers will disable them when you
-   set display:none; */
+Some browsers will disable them when you
+set display:none; */
 .zerosize {
         height: 0px;
         width: 0px;
@@ -803 +803 @@
 }
 
 /****************************************************************
-  avoid padding, margins or borders on dbx-box, 
-  to reduce visual discrepancies between it and the clone.  
-  overall, dbx-box is best left as visually unstyled as possible 
+avoid padding, margins or borders on dbx-box,
+to reduce visual discrepancies between it and the clone.
+overall, dbx-box is best left as visually unstyled as possible
 *****************************************************************/
 .dbx-box {
         margin:0;
@@ -870 +870 @@
         float: left;
         width: 40%;
         padding: .5em 2em;
-        margin: 1em; 
+        margin: 1em;
 }
 
 #your-profile fieldset input  {

wp-admin/xfn.js

@@ -10 +10 @@
 }
 
 function meChecked() {
-  var undefined;
-  var eMe = document.getElementById('me');
-  if (eMe == undefined) return false;
-  else return eMe.checked;
+        var undefined;
+        var eMe = document.getElementById('me');
+        if (eMe == undefined) return false;
+        else return eMe.checked;
 }
 
 function upit() {