Changeset 6026

Show
Ignore:
Timestamp:
09/03/07 23:32:58 (1 year ago)
Author:
ryan
Message:

Remove trailing whitespace

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/admin-footer.php

    r5955 r6026  
    11 
    22<div id="footer"> 
    3 <p><?php  
     3<p><?php 
    44 
    55$upgrade = apply_filters( 'update_footer', '' ); 
    6 echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade;  
     6echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade; 
    77 
    88?></p> 

  • trunk/wp-admin/admin-header.php

    r5965 r6026  
    1818<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
    1919<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title> 
    20 <?php wp_admin_css(); ?>  
     20<?php wp_admin_css(); ?> 
    2121<script type="text/javascript"> 
    2222//<![CDATA[ 

  • trunk/wp-admin/categories.php

    r5654 r6026  
    6161 
    6262    if ( wp_update_category($_POST) ) 
    63         wp_redirect('categories.php?message=3');  
     63        wp_redirect('categories.php?message=3'); 
    6464    else 
    65         wp_redirect('categories.php?message=5');  
     65        wp_redirect('categories.php?message=5'); 
    6666 
    6767    exit; 

  • trunk/wp-admin/edit-category-form.php

    r5529 r6026  
    3535        <tr> 
    3636            <th scope="row" valign="top"><label for="category_parent"><?php _e('Category parent:') ?></label></th> 
    37             <td>         
     37            <td> 
    3838                <?php wp_dropdown_categories('hide_empty=0&name=category_parent&orderby=name&selected=' . $category->parent . '&hierarchical=1&show_option_none=' . __('None')); ?> 
    3939            </td> 

  • trunk/wp-admin/edit-comments.php

    r5909 r6026  
    4040<div class="wrap"> 
    4141<h2><?php _e('Comments'); ?></h2> 
    42 <form name="searchform" action="" method="get" id="editcomments">  
    43   <fieldset>  
    44   <legend><?php _e('Show Comments That Contain...') ?></legend>  
    45   <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo attribute_escape($_GET['s']); ?>" size="17" />  
    46   <input type="submit" name="submit" value="<?php _e('Search') ?>"  />   
     42<form name="searchform" action="" method="get" id="editcomments"> 
     43  <fieldset> 
     44  <legend><?php _e('Show Comments That Contain...') ?></legend> 
     45  <input type="text" name="s" value="<?php if (isset($_GET['s'])) echo attribute_escape($_GET['s']); ?>" size="17" /> 
     46  <input type="submit" name="submit" value="<?php _e('Search') ?>"  /> 
    4747  <input type="hidden" name="mode" value="<?php echo $mode; ?>" /> 
    4848  <?php _e('(Searches within comment text, e-mail, URL, and IP address.)') ?> 
    49   </fieldset>  
     49  </fieldset> 
    5050</form> 
    5151<p><a href="?mode=view"><?php _e('View Mode') ?></a> | <a href="?mode=edit"><?php _e('Mass Edit Mode') ?></a></p> 
    …… 
    8989 
    9090$page_links = paginate_links( array( 
    91     'base' => add_query_arg( 'apage', '%#%' ),  
     91    'base' => add_query_arg( 'apage', '%#%' ), 
    9292    'format' => '', 
    9393    'total' => ceil($total / 20), 
    …… 
    177177        } ?></td> 
    178178  </tr> 
    179         <?php  
     179        <?php 
    180180        } // end foreach 
    181181    ?></table> 

  • trunk/wp-admin/edit-form-advanced.php

    r5786 r6026  
    8585<label for="comment_status" class="selectit"> 
    8686<input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> 
    87 <?php _e('Allow Comments') ?></label>  
     87<?php _e('Allow Comments') ?></label> 
    8888<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> 
    8989</div> 
    …… 
    9191 
    9292<fieldset id="passworddiv" class="dbx-box"> 
    93 <h3 class="dbx-handle"><?php _e('Post Password') ?></h3>  
     93<h3 class="dbx-handle"><?php _e('Post Password') ?></h3> 
    9494<div class="dbx-content"><input name="post_password" type="text" size="13" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></div> 
    9595</fieldset> 
    9696 
    9797<fieldset id="slugdiv" class="dbx-box"> 
    98 <h3 class="dbx-handle"><?php _e('Post Slug') ?></h3>  
     98<h3 class="dbx-handle"><?php _e('Post Slug') ?></h3> 
    9999<div class="dbx-content"><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /></div> 
    100100</fieldset> 
    101101 
    102102<fieldset id="poststatusdiv" class="dbx-box"> 
    103 <h3 class="dbx-handle"><?php _e('Post Status') ?></h3>  
     103<h3 class="dbx-handle"><?php _e('Post Status') ?></h3> 
    104104<div class="dbx-content"> 
    105105<?php if ( current_user_can('publish_posts') ) : ?> 
    …… 
    118118<?php endif; ?> 
    119119 
    120 <?php  
     120<?php 
    121121$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM 
    122122if ( $authors && count( $authors ) > 1 ) : 
    …… 
    164164<span id="autosave"></span> 
    165165<?php echo $saveasdraft; ?> 
    166 <input type="submit" name="submit" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" />  
    167 <?php  
     166<input type="submit" name="submit" value="<?php _e('Save'); ?>" style="font-weight: bold;" tabindex="4" /> 
     167<?php 
    168168if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) { 
    169169?> 
    170170<?php if ( current_user_can('publish_posts') ) : ?> 
    171     <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />  
     171    <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> 
    172172<?php else : ?> 
    173     <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" />  
    174 <?php endif; ?> 
    175 <?php 
    176 } 
    177 ?> 
    178 <input name="referredby" type="hidden" id="referredby" value="<?php  
     173    <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> 
     174<?php endif; ?> 
     175<?php 
     176} 
     177?> 
     178<input name="referredby" type="hidden" id="referredby" value="<?php 
    179179if ( !empty($_REQUEST['popupurl']) ) 
    180180    echo clean_url(stripslashes($_REQUEST['popupurl'])); 

  • trunk/wp-admin/edit-form-comment.php

    r6003 r6026  
    5555    <tr> 
    5656        <th scope="row" valign="top"><?php _e('Comment Status') ?>:</th> 
    57         <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> &nbsp;  
    58         <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> &nbsp;  
     57        <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> &nbsp; 
     58        <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> &nbsp; 
    5959        <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> 
    6060    </tr> 
    …… 
    6969    <tr> 
    7070        <th scope="row" valign="top">&nbsp;</th> 
    71         <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { document.forms.post._wpnonce.value = '" . wp_create_nonce( 'delete-comment_' . $comment->comment_ID ) . "'; return true; } return false;\""; ?> />  
     71        <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n  'Cancel' to stop, 'OK' to delete.")) . "') ) { document.forms.post._wpnonce.value = '" . wp_create_nonce( 'delete-comment_' . $comment->comment_ID ) . "'; return true; } return false;\""; ?> /> 
    7272        <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" /> 
    7373        <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" /> 

  • trunk/wp-admin/edit-form.php

    r5543 r6026  
    2121<div id="poststuff"> 
    2222    <fieldset id="titlediv"> 
    23       <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>  
     23      <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend> 
    2424      <div><input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" /></div> 
    2525    </fieldset> 
    2626 
    2727    <fieldset id="categorydiv"> 
    28       <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend>  
     28      <legend><a href="http://wordpress.org/docs/reference/post/#category" title="<?php _e('Help on categories') ?>"><?php _e('Categories') ?></a></legend> 
    2929      <div><?php dropdown_categories($post->post_category); ?></div> 
    3030    </fieldset> 

  • trunk/wp-admin/edit-pages.php

    r5963 r6026  
    7272if ($posts) { 
    7373?> 
    74 <table class="widefat">  
     74<table class="widefat"> 
    7575  <thead> 
    7676  <tr> 

  • trunk/wp-admin/edit-post-rows.php

    r5933 r6026  
    103103} 
    104104?> 
    105     </tr>  
     105    </tr> 
    106106<?php 
    107107endwhile; 
    108108} else { 
    109109?> 
    110   <tr style='background-color: <?php echo $bgcolor; ?>'>  
    111     <td colspan="8"><?php _e('No posts found.') ?></td>  
    112   </tr>  
     110  <tr style='background-color: <?php echo $bgcolor; ?>'> 
     111    <td colspan="8"><?php _e('No posts found.') ?></td> 
     112  </tr> 
    113113<?php 
    114114} // end if ( have_posts() ) 

  • trunk/wp-admin/edit.php

    r5963 r6026  
    8484        } else { 
    8585            $author_user = get_userdata( get_query_var( 'author' ) ); 
    86             $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name ));     
     86            $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); 
    8787        } 
    8888    } 
    …… 
    9595 
    9696<form name="searchform" id="searchform" action="" method="get"> 
    97     <fieldset><legend><?php _e('Search terms&hellip;'); ?></legend>  
    98         <input type="text" name="s" id="s" value="<?php the_search_query(); ?>" size="17" />  
    99     </fieldset> 
    100  
    101     <fieldset><legend><?php _e('Status&hellip;'); ?></legend>  
     97    <fieldset><legend><?php _e('Search terms&hellip;'); ?></legend> 
     98        <input type="text" name="s" id="s" value="<?php the_search_query(); ?>" size="17" /> 
     99    </fieldset> 
     100 
     101    <fieldset><legend><?php _e('Status&hellip;'); ?></legend> 
    102102        <select name='post_status'> 
    103103            <option<?php selected( @$_GET['post_status'], 0 ); ?> value='0'><?php _e('Any'); ?></option> 
    …… 
    108108    </fieldset> 
    109109 
    110 <?php  
     110<?php 
    111111$editable_ids = get_editable_user_ids( $user_ID ); 
    112112if ( $editable_ids && count( $editable_ids ) > 1 ) : 
    …… 
    154154        <?php wp_dropdown_categories('show_option_all='.__('All').'&hide_empty=1&hierarchical=1&show_count=1&selected='.$cat);?> 
    155155    </fieldset> 
    156     <input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" />  
     156    <input type="submit" id="post-query-submit" value="<?php _e('Filter &#187;'); ?>" class="button" /> 
    157157</form> 
    158158 

  • trunk/wp-admin/import/blogger.php

    r5966 r6026  
    920920        } else if(in_array($tag, $this->ATOM_CONTENT_ELEMENTS) || in_array($tag, $this->ATOM_SIMPLE_ELEMENTS)) { 
    921921            $this->in_content = array(); 
    922             $this->is_xhtml = $attrs['type'] == 'xhtml';  
     922            $this->is_xhtml = $attrs['type'] == 'xhtml'; 
    923923            array_push($this->in_content, array($tag,$this->depth)); 
    924924        } else if($tag == 'link') { 
    …… 
    936936 
    937937        if(!empty($this->in_content)) { 
    938             if($this->in_content[0][0] == $tag &&  
     938            if($this->in_content[0][0] == $tag && 
    939939            $this->in_content[0][1] == $this->depth) { 
    940940                array_shift($this->in_content); 
    …… 
    999999                } 
    10001000            } 
    1001         }  
     1001        } 
    10021002        return $name; 
    10031003    } 
    …… 
    10051005    function xml_escape($string) 
    10061006    { 
    1007              return str_replace(array('&','"',"'",'<','>'),  
    1008                 array('&amp;','&quot;','&apos;','&lt;','&gt;'),  
     1007             return str_replace(array('&','"',"'",'<','>'), 
     1008                array('&amp;','&quot;','&apos;','&lt;','&gt;'), 
    10091009                $string ); 
    10101010    } 

  • trunk/wp-admin/import/dotclear.php

    r5953 r6026  
    110110class Dotclear_Import { 
    111111 
    112     function header()  
     112    function header() 
    113113    { 
    114114        echo '<div class="wrap">'; 
    …… 
    117117    } 
    118118 
    119     function footer()  
     119    function footer() 
    120120    { 
    121121        echo '</div>'; 
    122122    } 
    123123 
    124     function greet()  
     124    function greet() 
    125125    { 
    126126        echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog.  Mileage may vary.').'</p>'; 

  • trunk/wp-admin/import/mt.php

    r5962 r6026  
    358358                    $post->post_date_gmt = $date_gmt; 
    359359                } else if ( 'comment' == $context ) { 
    360                     $comment->comment_date = $date;     
     360                    $comment->comment_date = $date; 
    361361                } else if ( 'ping' == $context ) { 
    362                     $ping->comment_date = $date;    
     362                    $ping->comment_date = $date; 
    363363                } 
    364364            } else if ( 0 === strpos($line, "EMAIL:") ) { 

  • trunk/wp-admin/import/stp.php

    r5977 r6026  
    2020        echo '<p><strong>'.__('Don&#8217;t be stupid - backup your database before proceeding!').'</strong></p>'; 
    2121        echo '<form action="admin.php?import=stp&amp;step=1" method="post">'; 
    22         wp_nonce_field('import-utw');  
     22        wp_nonce_field('import-utw'); 
    2323        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 1 &raquo;').'" /></p>'; 
    2424        echo '</form>'; 
    …… 
    8989 
    9090        echo '<form action="admin.php?import=stp&amp;step=2" method="post">'; 
    91         wp_nonce_field('import-utw');  
     91        wp_nonce_field('import-utw'); 
    9292        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 2 &raquo;').'" /></p>'; 
    9393        echo '</form>'; 
    …… 
    108108 
    109109        echo '<form action="admin.php?import=stp&amp;step=3" method="post">'; 
    110         wp_nonce_field('import-utw');  
     110        wp_nonce_field('import-utw'); 
    111111        echo '<p class="submit"><input type="submit" name="submit" value="'.__('Step 3 &raquo;').'" /></p>'; 
    112112        echo '</form>'; 
    …… 
    140140 
    141141        // loop through each post and add its tags to the db 
    142         foreach ( $posts as $this_post ) {       
     142        foreach ( $posts as $this_post ) { 
    143143            $the_post = (int) $this_post->post_id; 
    144144            $the_tag = $wpdb->escape($this_post->tag_name); 

  • trunk/wp-admin/import/textpattern.php

    r5953 r6026  
    2727class Textpattern_Import { 
    2828 
    29     function header()  
     29    function header() 
    3030    { 
    3131        echo '<div class="wrap">'; 
    …… 
    3434    } 
    3535 
    36     function footer()  
     36    function footer() 
    3737    { 
    3838        echo '</div>'; 

  • trunk/wp-admin/import/wordpress.php

    r5937 r6026  
    105105                    $this->posts[$num] = ''; 
    106106                    $doing_entry = true; 
    107                     continue;   
     107                    continue; 
    108108                } 
    109109                if ( false !== strpos($importline, '</item>') ) { 
    110110                    $num++; 
    111111                    $doing_entry = false; 
    112                     continue;   
     112                    continue; 
    113113                } 
    114114                if ( $doing_entry ) { 
    …… 
    336336                } 
    337337                wp_set_post_categories($post_id, $post_cats); 
    338             }   
     338            } 
    339339        } 
    340340 

  • trunk/wp-admin/includes/plugin.php

    r6020 r6026  
    262262        foreach (array_keys( $submenu ) as $parent) { 
    263263            foreach ( $submenu[$parent] as $submenu_array ) { 
    264                 if ( isset( $plugin_page ) &&  
    265                     ($plugin_page == $submenu_array[2] ) &&  
     264                if ( isset( $plugin_page ) && 
     265                    ($plugin_page == $submenu_array[2] ) && 
    266266                    (($parent == $pagenow ) || ($parent == $plugin_page ) || ($plugin_page == $hook ) || (($pagenow == 'admin.php' ) && ($parent1 != $submenu_array[2] ) ) ) 
    267267                    ) { 

  • trunk/wp-admin/includes/post.php

    r5967 r6026  
    335335 
    336336    if ( ('0' === $metavalue || !empty ( $metavalue ) ) && ((('#NONE#' != $metakeyselect) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput) ) ) { 
    337         // We have a key/value pair. If both the select and the  
     337        // We have a key/value pair. If both the select and the 
    338338        // input for the key have data, the input takes precedence: 
    339339 
    …… 
    348348 
    349349        $result = $wpdb->query( " 
    350                         INSERT INTO $wpdb->postmeta  
    351                         (post_id,meta_key,meta_value )  
     350                        INSERT INTO $wpdb->postmeta 
     351                        (post_id,meta_key,meta_value ) 
    352352                        VALUES ('$post_ID','$metakey','$metavalue' ) 
    353353                    " ); 

  • trunk/wp-admin/includes/taxonomy.php

    r5938 r6026  
    152152        return $id; 
    153153 
    154     return wp_insert_term($tag_name, 'post_tag');   
     154    return wp_insert_term($tag_name, 'post_tag'); 
    155155} 
    156156 

  • trunk/wp-admin/includes/template.php

    r5998 r6026  
    181181        $class = ('alternate' == $class ) ? '' : 'alternate'; 
    182182?> 
    183   <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'>  
    184     <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th>  
     183  <tr id='page-<?php echo $id; ?>' class='<?php echo $class; ?>'> 
     184    <th scope="row" style="text-align: center"><?php echo $post->ID; ?></th> 
    185185    <td> 
    186186      <?php echo $pad; ?><?php the_title() ?> 
    187     </td>  
     187    </td> 
    188188    <td><?php the_author() ?></td> 
    189     <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td>  
     189    <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td> 
    190190    <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e( 'View' ); ?></a></td> 
    191     <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td>  
    192     <td><?php if ( current_user_can( 'delete_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 . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\">" . __( 'Delete' ) . "</a>"; } ?></td>  
    193   </tr>  
     191    <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&amp;post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td> 
     192    <td><?php if ( current_user_can( 'delete_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 . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\">" . __( 'Delete' ) . "</a>"; } ?></td> 
     193  </tr> 
    194194 
    195195<?php 

  • trunk/wp-admin/includes/update.php

    r5994 r6026  
    6363    } 
    6464 
    65     if (  
    66         isset( $current->last_checked ) &&  
    67         43200 > ( time() - $current->last_checked ) &&  
     65    if ( 
     66        isset( $current->last_checked ) && 
     67        43200 > ( time() - $current->last_checked ) && 
    6868        !$plugin_changed 
    6969    ) 

  • trunk/wp-admin/includes/upgrade.php

    r6025 r6026  
    625625            if ( empty($term_id) ) { 
    626626                $wpdb->query("INSERT INTO $wpdb->terms (name, slug, term_group) VALUES ('$name', '$slug', '$term_group')"); 
    627                 $term_id = (int) $wpdb->insert_id;  
     627                $term_id = (int) $wpdb->insert_id; 
    628628            } 
    629629 

  • trunk/wp-admin/includes/user.php

    r5750 r6026  
    4040        $pass2 = $_POST['pass2']; 
    4141 
    42     if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {  
     42    if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) { 
    4343        if( $user_id != $current_user->id || $wp_roles->role_objects[$_POST['role']]->has_cap( 'edit_users' )) 
    4444            $user->role = $_POST['role']; 

  • trunk/wp-admin/index-extra.php

    r5893 r6026  
    99case 'incominglinks' : 
    1010 
    11 $rss_feed = apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) );  
     11$rss_feed = apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ); 
    1212$more_link = apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ); 
    1313 

  • trunk/wp-admin/index.php

    r6002 r6026  
    11<?php 
    2 require_once('admin.php');  
     2require_once('admin.php'); 
    33 
    44function index_js() { 
    …… 
    1717wp_enqueue_script( 'jquery' ); 
    1818 
    19 $title = __('Dashboard');  
     19$title = __('Dashboard'); 
    2020$parent_file = 'index.php'; 
    2121require_once('admin-header.php'); 
    …… 
    4040?> 
    4141<div> 
    42 <h3><?php printf( __( 'Comments <a href="%s" title="More comments&#8230;">&raquo;</a>' ), 'edit-comments.php' ); ?></h3>  
     42<h3><?php printf( __( 'Comments <a href="%s" title="More comments&#8230;">&raquo;</a>' ), 'edit-comments.php' ); ?></h3> 
    4343 
    4444<?php if ( $numcomments ) : ?> 

  • trunk/wp-admin/link-category.php

    r5654 r6026  
    6161 
    6262    if ( wp_update_term($cat_ID, 'link_category', $_POST) ) 
    63         wp_redirect('edit-link-categories.php?message=3');  
     63        wp_redirect('edit-link-categories.php?message=3'); 
    6464    else 
    65         wp_redirect('edit-link-categories.php?message=5');  
     65        wp_redirect('edit-link-categories.php?message=5'); 
    6666 
    6767    exit; 

  • trunk/wp-admin/link-import.php

    r5835 r6026  
    124124 
    125125if ( ! $blogrolling ) 
    126     apply_filters( 'wp_delete_file', $opml_url);  
     126    apply_filters( 'wp_delete_file', $opml_url); 
    127127    @unlink($opml_url); 
    128128?> 

  • trunk/wp-admin/menu.php

    r5654 r6026  
    9797// submenu in line be assigned as the new menu parent. 
    9898foreach ( $menu as $id => $data ) { 
    99     if ( empty($submenu[$data[2]]) )  
     99    if ( empty($submenu[$data[2]]) ) 
    100100        continue; 
    101101    $subs = $submenu[$data[2]]; 

  • trunk/wp-admin/moderation.php

    r5773 r6026  
    125125$stop = $start + $per; 
    126126 
    127 $page_links = paginate_links( array(  
    128     'base' => add_query_arg( 'paged', '%#%' ),  
    129     'format' => '',  
    130     'total' => ceil( $total / $per ),  
    131     'current' => $page,  
    132     'prev_text' => '&laquo;',  
     127$page_links = paginate_links( array( 
     128    'base' => add_query_arg( 'paged', '%#%' ), 
     129    'format' => '', 
     130    'total' => ceil( $total / $per ), 
     131    'current' => $page, 
     132    'prev_text' => '&laquo;', 
    133133    'next_text' => '&raquo;' 
    134134) ); 
    …… 
    161161            <li id="comment-<?php comment_ID(); ?>" class="<?php echo $class; ?>"> 
    162162                <p> 
    163                     <strong><?php comment_author(); ?></strong>  
     163                    <strong><?php comment_author(); ?></strong> 
    164164                    <?php if ( !empty( $comment->comment_author_email ) ) { ?>| <?php comment_author_email_link(); ?> <?php } ?> 
    165165                    <?php if ( !empty( $comment->comment_author_url ) && $comment->comment_author_url != 'http://' ) { ?>| <?php comment_author_url_link(); ?> <?php } ?> 
    …… 
    172172 
    173173                <p><small> 
    174                     <?php comment_date( __( 'M j, g:i A' ) ); ?> &#8212;  
    175                     [ <a href="comment.php?action=editcomment&amp;c=<?php comment_ID(); ?>" title="<?php _e( 'Edit this comment' ); ?>"><?php _e( 'Edit' ); ?></a> |  
    176                     <a href="post.php?action=deletecomment&amp;p=<?php echo $comment->comment_post_ID; ?>" title="<?php _e( 'Delete this comment' ); ?>" onclick="return deleteSomething( 'comment', <?php comment_ID(); ?>, '<?php echo js_escape( sprintf( __( "You are about to delete this comment by '%s'.\n'OK' to delete, 'Cancel' to stop." ), get_comment_author() ) ); ?>', theCommentList );"><?php _e( 'Delete' ); ?></a> ] &#8212;  
     174                    <?php comment_date( __( 'M j, g:i A' ) ); ?> &#8212; 
     175                    [ <a href="comment.php?action=editcomment&amp;c=<?php comment_ID(); ?>" title="<?php _e( 'Edit this comment' ); ?>"><?php _e( 'Edit' ); ?></a> | 
     176                    <a href="post.php?action=deletecomment&amp;p=<?php echo $comment->comment_post_ID; ?>" title="<?php _e( 'Delete this comment' ); ?>" onclick="return deleteSomething( 'comment', <?php comment_ID(); ?>, '<?php echo js_escape( sprintf( __( "You are about to delete this comment by '%s'.\n'OK' to delete, 'Cancel' to stop." ), get_comment_author() ) ); ?>', theCommentList );"><?php _e( 'Delete' ); ?></a> ] &#8212; 
    177177                    <a href="<?php echo get_permalink( $comment->comment_post_ID ); ?>" title="<?php _e( 'View the post' ); ?>"><?php printf( __( 'View post &#8220;%s&#8221;' ), get_the_title( $comment->comment_post_ID ) ); ?></a> 
    178178                </small></p> 

  • trunk/wp-admin/options-discussion.php

    r5825 r6026  
    88?> 
    99 
    10 <div class="wrap">  
    11 <h2><?php _e('Discussion Options') ?></h2>  
    12 <form method="post" action="options.php">  
     10<div class="wrap"> 
     11<h2><?php _e('Discussion Options') ?></h2> 
     12<form method="post" action="options.php"> 
    1313<?php wp_nonce_field('update-options') ?> 
    1414<p class="submit"><input type="submit" name="Submit" value="<?php _e('Update Options &raquo;') ?>" /></p> 
    1515<fieldset class="options"> 
    16 <legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend>  
    17 <ul>  
    18 <li>  
    19 <label for="default_pingback_flag">  
    20 <input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> />  
    21 <?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label>  
    22 </li>  
    23 <li>  
    24 <label for="default_ping_status">  
    25 <input name="default_ping_status" type="checkbox" id="default_ping_status" value="open" <?php checked('open', get_option('default_ping_status')); ?> />  
    26 <?php _e('Allow link notifications from other blogs (pingbacks and trackbacks.)') ?></label>  
    27 </li>  
    28 <li>  
    29 <label for="default_comment_status">  
    30 <input name="default_comment_status" type="checkbox" id="default_comment_status" value="open" <?php checked('open', get_option('default_comment_status')); ?> />  
    31 <?php _e('Allow people to post comments on the article') ?></label>  
    32 </li>  
    33 </ul>  
     16<legend><?php echo __('Usual settings for an article:').'<br /><small><em>('.__('These settings may be overridden for individual articles.').')</em></small>'; ?></legend> 
     17<ul> 
     18<li> 
     19<label for="default_pingback_flag"> 
     20<input name="default_pingback_flag" type="checkbox" id="default_pingback_flag" value="1" <?php checked('1', get_option('default_pingback_flag')); ?> /> 
     21<?php _e('Attempt to notify any blogs linked to from the article (slows down posting.)') ?></label> 
     22</li