WordPress.org

Make WordPress Core

Changeset 12733


Ignore:
Timestamp:
01/15/2010 10:11:12 PM (8 years ago)
Author:
ryan
Message:

Trailing whitespace cleanup

Location:
trunk
Files:
59 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r12689 r12733  
    1515function wpmu_activate_stylesheet() {
    1616    ?>
    17     <style type="text/css"> 
     17    <style type="text/css">
    1818        form { margin-top: 2em; }
    1919        #submit, #key { width: 90%; font-size: 24px; }
     
    3131<div id="content" class="widecolumn">
    3232    <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?>
    33        
     33
    3434        <h2><?php _e('Activation Key Required') ?></h2>
    3535        <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php">
     
    4242            </p>
    4343        </form>
    44        
     44
    4545    <?php } else {
    4646
    4747        $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
    48         $result = wpmu_activate_signup($key);       
     48        $result = wpmu_activate_signup($key);
    4949        if ( is_wp_error($result) ) {
    5050            if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
     
    7070            ?>
    7171            <h2><?php _e('Your account is now active!'); ?></h2>
    72            
     72
    7373            <div id="signup-welcome">
    7474                <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
    7575                <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
    7676            </div>
    77                    
     77
    7878            <?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?>
    7979                <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p>
     
    8181                <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p>
    8282            <?php endif;
    83         }       
     83        }
    8484    }
    8585    ?>
  • trunk/wp-admin/admin.php

    r12731 r12733  
    3333    } elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
    3434        /**
    35          * On really small MU installs run the upgrader every time, 
     35         * On really small MU installs run the upgrader every time,
    3636         * else run it less often to reduce load.
    3737         *
  • trunk/wp-admin/categories.php

    r12716 r12733  
    2828} else {
    2929    $parent_file = 'edit.php';
    30     $submenu_file = "categories.php?taxonomy=$taxonomy";   
     30    $submenu_file = "categories.php?taxonomy=$taxonomy";
    3131}
    3232
  • trunk/wp-admin/css/wp-admin-rtl.css

    r12721 r12733  
    1010}
    1111.quicktags, .search {
    12     font-family: Tahoma, Arial, sans-serif; 
     12    font-family: Tahoma, Arial, sans-serif;
    1313}
    1414/* 200 - 500
     
    5252.button-highlighted,
    5353#postcustomstuff .submit input {
    54     font-family: Tahoma, Arial, sans-serif; 
     54    font-family: Tahoma, Arial, sans-serif;
    5555}
    5656#wpcontent select {
    57     font-family: Tahoma, Arial, sans-serif; 
     57    font-family: Tahoma, Arial, sans-serif;
    5858}
    5959#quicktags {
     
    7070}
    7171#your-profile legend {
    72     font-family: Tahoma, Arial, sans-serif; 
     72    font-family: Tahoma, Arial, sans-serif;
    7373}
    7474#ajax-response.alignleft {
     
    9494    margin-right: 0;
    9595    margin-left: 10px;
    96     font-family: Tahoma, Arial, sans-serif; 
     96    font-family: Tahoma, Arial, sans-serif;
    9797}
    9898#postcustomstuff table input,
     
    116116}
    117117#wphead h1 {
    118     font-family: Tahoma, Arial, sans-serif; 
     118    font-family: Tahoma, Arial, sans-serif;
    119119    float: right;
    120120}
    121121#wphead h1.long-title {
    122     font-family: Tahoma, Arial, sans-serif; 
     122    font-family: Tahoma, Arial, sans-serif;
    123123}
    124124#adminmenu .wp-submenu a {
     
    127127    border-width: 0 0 0 1px;
    128128    border-style: none none none solid;
    129     font-family: Tahoma, Arial, sans-serif; 
     129    font-family: Tahoma, Arial, sans-serif;
    130130}
    131131#adminmenu a.menu-top,
    132132#adminmenu .wp-submenu-head {
    133     font-family: Tahoma, Arial, sans-serif; 
     133    font-family: Tahoma, Arial, sans-serif;
    134134}
    135135#adminmenu img.wp-menu-image {
     
    178178#adminmenu span.update-plugins,
    179179#sidemenu li a span.update-plugins {
    180     font-family: Tahoma, Arial, sans-serif; 
     180    font-family: Tahoma, Arial, sans-serif;
    181181    margin-left: 0;
    182182    margin-right: 2px;
     
    188188}
    189189.post-com-count-wrapper {
    190     font-family: Tahoma, Arial, sans-serif; 
     190    font-family: Tahoma, Arial, sans-serif;
    191191}
    192192.column-response .post-com-count {
     
    250250}
    251251.description, .form-wrap p {
    252     font-family: Tahoma, Arial, sans-serif; 
     252    font-family: Tahoma, Arial, sans-serif;
    253253}
    254254/* 1500 - 1800
     
    258258}
    259259.howto {
    260     font-family: Tahoma, Arial, sans-serif; 
     260    font-family: Tahoma, Arial, sans-serif;
    261261}
    262262.postarea h3 label {
     
    373373}
    374374.tool-box .title {
    375     font-family: Tahoma, Arial, sans-serif; 
     375    font-family: Tahoma, Arial, sans-serif;
    376376}
    377377.settings-toggle {
     
    414414#contextual-help-link-wrap {
    415415    float: left;
    416     font-family: Tahoma, Arial, sans-serif; 
     416    font-family: Tahoma, Arial, sans-serif;
    417417    margin: 0 0 0 6px;
    418418}
     
    477477.inline-edit-row .cathide,
    478478.inline-edit-row #bulk-titles div {
    479     font-family: Tahoma, Arial, sans-serif; 
     479    font-family: Tahoma, Arial, sans-serif;
    480480}
    481481.quick-edit-row-post fieldset label.inline-edit-status {
  • trunk/wp-admin/edit-tags.php

    r12712 r12733  
    2828} else {
    2929    $parent_file = 'edit.php';
    30     $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; 
     30    $submenu_file = "edit-tags.php?taxonomy=$taxonomy";
    3131}
    3232
  • trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

    r12723 r12733  
    112112        return explode("\n", $this->get_contents($file));
    113113    }
    114    
     114
    115115    function put_contents($file, $contents, $mode = false ) {
    116116        $temp = tmpfile();
  • trunk/wp-admin/includes/comment.php

    r12715 r12733  
    126126            return absint($pending[0]['num_comments']);
    127127    }
    128    
     128
    129129    $pending_keyed = array();
    130    
     130
    131131    // Default to zero pending for all posts in request
    132132    foreach ( $post_id_array as $id )
  • trunk/wp-admin/includes/dashboard.php

    r12459 r12733  
    637637    if ( !$rss->get_item_quantity() ) {
    638638        echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links&hellip; yet. It&#8217;s okay &#8212; there is no rush.') . "</p>\n";
    639         $rss->__destruct(); 
     639        $rss->__destruct();
    640640        unset($rss);
    641641        return;
     
    692692
    693693    echo "</ul>\n";
    694     $rss->__destruct(); 
     694    $rss->__destruct();
    695695    unset($rss);
    696696}
     
    749749        }
    750750    } elseif ( !$rss->get_item_quantity() ) {
    751         $rss->__destruct(); 
     751        $rss->__destruct();
    752752        unset($rss);
    753753        return false;
     
    756756        wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
    757757        echo '</div>';
    758         $rss->__destruct(); 
     758        $rss->__destruct();
    759759        unset($rss);
    760760    }
     
    840840        echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
    841841        echo "<p>$description</p>\n";
    842        
     842
    843843        $$feed->__destruct();
    844844        unset($$feed);
     
    939939                $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
    940940            } else {
    941                 $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title())); 
     941                $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
    942942                $rss->__destruct();
    943                 unset($rss);               
     943                unset($rss);
    944944            }
    945945        }
  • trunk/wp-admin/includes/file.php

    r12723 r12733  
    156156    if  ( function_exists('sys_get_temp_dir') )
    157157        return trailingslashit(sys_get_temp_dir());
    158    
     158
    159159    $temp = ini_get('upload_tmp_dir');
    160160    if ( is_dir($temp) ) // always writable
  • trunk/wp-admin/includes/image-edit.php

    r12555 r12733  
    4040        <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php
    4141
    42     // On some setups GD library does not provide imagerotate() - Ticket #11536   
     42    // On some setups GD library does not provide imagerotate() - Ticket #11536
    4343    if ( function_exists('imagerotate') ) { ?>
    4444        <div class="imgedit-rleft"  onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div>
     
    9797        <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a>
    9898        <div class="imgedit-help">
    99         <p><?php _e('Discard any changes and restore the original image.'); 
     99        <p><?php _e('Discard any changes and restore the original image.');
    100100
    101101        if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE )
  • trunk/wp-admin/includes/media.php

    r12582 r12733  
    10201020    $edit_post = sanitize_post($post, 'edit');
    10211021
    1022    
     1022
    10231023
    10241024    $form_fields = array(
     
    12241224            if ( !empty( $media_dims ) )
    12251225                $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
    1226            
     1226
    12271227            echo "</td></tr>\n";
    12281228
    1229    
     1229
    12301230
    12311231    $item .= "
     
    12491249        } elseif ( !MEDIA_TRASH ) {
    12501250            $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
    1251              <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . " 
    1252              <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a> 
     1251             <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "
     1252             <a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
    12531253             <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
    12541254             </div>";
    12551255        } else {
    1256             $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a> 
     1256            $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&amp;post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a>
    12571257            <a href='" . wp_nonce_url( "post.php?action=untrash&amp;post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>";
    12581258        }
  • trunk/wp-admin/includes/misc.php

    r12728 r12733  
    232232/**
    233233 * Resets global variables based on $_GET and $_POST
    234  * 
     234 *
    235235 * This function resets global variables based on the names passed
    236236 * in the $vars array to the value of $_POST[$var] or $_GET[$var] or ''
  • trunk/wp-admin/includes/plugin.php

    r12673 r12733  
    6868function get_plugin_data( $plugin_file, $markup = true, $translate = true ) {
    6969
    70     $default_headers = array( 
    71         'Name' => 'Plugin Name', 
    72         'PluginURI' => 'Plugin URI', 
    73         'Version' => 'Version', 
    74         'Description' => 'Description', 
    75         'Author' => 'Author', 
    76         'AuthorURI' => 'Author URI', 
    77         'TextDomain' => 'Text Domain', 
    78         'DomainPath' => 'Domain Path' 
     70    $default_headers = array(
     71        'Name' => 'Plugin Name',
     72        'PluginURI' => 'Plugin URI',
     73        'Version' => 'Version',
     74        'Description' => 'Description',
     75        'Author' => 'Author',
     76        'AuthorURI' => 'Author URI',
     77        'TextDomain' => 'Text Domain',
     78        'DomainPath' => 'Domain Path'
    7979        );
    8080
  • trunk/wp-admin/includes/post.php

    r12728 r12733  
    959959 * @since unknown
    960960 *
    961  * @param int|object $id    Post ID or post object. 
    962  * @param string $title (optional) Title 
    963  * @param string $name (optional) Name 
    964  * @return array With two entries of type string 
     961 * @param int|object $id    Post ID or post object.
     962 * @param string $title (optional) Title
     963 * @param string $name (optional) Name
     964 * @return array With two entries of type string
    965965 */
    966966function get_sample_permalink($id, $title = null, $name = null) {
     
    10161016 *
    10171017 * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
    1018  * 
    1019  * @since unknown
    1020  *
    1021  * @param int|object $id Post ID or post object. 
    1022  * @param string $new_title (optional) New title 
    1023  * @param string $new_slug (optional) New slug 
    1024  * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 
     1018 *
     1019 * @since unknown
     1020 *
     1021 * @param int|object $id Post ID or post object.
     1022 * @param string $new_title (optional) New title
     1023 * @param string $new_slug (optional) New slug
     1024 * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor.
    10251025 */
    10261026function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
     
    11861186 * @uses _wp_translate_postdata()
    11871187 * @uses _wp_post_revision_fields()
    1188  * 
     1188 *
    11891189 * @return unknown
    11901190 */
  • trunk/wp-admin/includes/schema.php

    r12411 r12733  
    352352    foreach ($unusedoptions as $option)
    353353        delete_option($option);
    354    
     354
    355355    // delete obsolete magpie stuff
    356356    $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
  • trunk/wp-admin/includes/theme.php

    r12673 r12733  
    157157/**
    158158 * Tidies a filename for url display by the theme editor.
    159  * 
     159 *
    160160 * @since 2.9.0
    161161 * @private
    162  * 
     162 *
    163163 * @param string $fullpath Full path to the theme file
    164164 * @param string $containingfolder Path of the theme parent folder
  • trunk/wp-admin/includes/widgets.php

    r12360 r12733  
    6969    if ( !empty( $description ) ) {
    7070        echo "<div class='sidebar-description'>\n";
    71         echo "\t<p class='description'>$description</p>"; 
     71        echo "\t<p class='description'>$description</p>";
    7272        echo "</div>\n";
    7373    }
  • trunk/wp-admin/js/widgets.dev.js

    r11870 r12733  
    3030        $('a.widget-action').live('click', function(){
    3131            var css = {}, widget = $(this).closest('div.widget'), inside = widget.children('.widget-inside'), w = parseInt( widget.find('input.widget-width').val(), 10 );
    32            
     32
    3333            if ( inside.is(':hidden') ) {
    3434                if ( w > 250 && inside.closest('div.widgets-sortables').length ) {
  • trunk/wp-admin/js/wp-gears.dev.js

    r11719 r12733  
    3333        if ( host.match(/[^a-z0-9._-]/i) )
    3434            host = encodeURIComponent(host);
    35        
     35
    3636        name = window.location.protocol + host;
    3737        name = name.replace(/[^a-z0-9._-]+/gi, '_');
  • trunk/wp-admin/menu-header.php

    r12712 r12733  
    1919
    2020global $menu, $submenu, $parent_file; //For when admin-header is included from within a function.
    21 $parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around. 
     21$parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around.
    2222
    2323get_admin_page_parent();
  • trunk/wp-admin/menu.php

    r12728 r12733  
    138138    elseif ( is_super_admin() || get_site_option( 'add_new_users' ) )
    139139        $submenu['users.php'][10] = array(__('Add New') . ' <strong>*</strong>', 'create_users', 'ms-options.php#addnewusers');
    140        
     140
    141141    $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php');
    142142} else {
  • trunk/wp-admin/ms-sites.php

    r12725 r12733  
    310310    // List blogs
    311311    default:
    312         $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1; 
    313         $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15; 
     312        $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1;
     313        $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15;
    314314        $s = wp_specialchars( trim( $_GET[ 's' ] ) );
    315315        $like_s = like_escape($s);
    316        
     316
    317317        $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
    318318
  • trunk/wp-admin/options-general.php

    r12728 r12733  
    301301if( is_array($lang_files) && !empty($lang_files) ) {
    302302    ?>
    303     <tr valign="top"> 
    304         <th width="33%" scope="row"><?php _e('Blog language:') ?></th> 
     303    <tr valign="top">
     304        <th width="33%" scope="row"><?php _e('Blog language:') ?></th>
    305305        <td>
    306306            <select name="WPLANG" id="WPLANG">
     
    308308            </select>
    309309        </td>
    310     </tr> 
     310    </tr>
    311311    <?php
    312312} // languages
  • trunk/wp-admin/options-permalink.php

    r12718 r12733  
    237237<?php if ( !is_multisite || is_super_admin() ) { ?>
    238238<?php if ($iis7_permalinks) :
    239     if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : 
     239    if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
    240240        if ( file_exists($home_path . 'web.config') ) : ?>
    241241<p><?php _e('If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
     
    251251    <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p>
    252252</form>
    253 <p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.')  ?></p>           
     253<p><?php _e('If you temporarily make your site&#8217;s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.')  ?></p>
    254254        <?php endif; ?>
    255255    <?php endif; ?>
  • trunk/wp-admin/options.php

    r12712 r12733  
    7070    if ( 'options' == $option_page ) {
    7171        $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
    72         if ( !is_super_admin() ) 
     72        if ( !is_super_admin() )
    7373            wp_die( __( 'Not allowed here' ) );
    7474    } else {
  • trunk/wp-admin/press-this.php

    r12592 r12733  
    2929    $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
    3030    $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : '  ';
    31     $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 
     31    $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
    3232
    3333    // insert the post with nothing in it, to get an ID
     
    401401                }
    402402                jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
    403                
     403
    404404                if(photostorage == false) {
    405405                    jQuery.ajax({
  • trunk/wp-admin/theme-editor.php

    r12569 r12733  
    3838    $file = stripslashes($file);
    3939    if ( 'theme' == $dir ) {
    40         $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 
     40        $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ;
    4141    } else if ( 'style' == $dir) {
    42         $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ; 
     42        $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ;
    4343    }
    4444}
  • trunk/wp-admin/themes.php

    r12728 r12733  
    1616    $themes = get_themes();
    1717    $ct = current_theme_info();
    18     $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() ); 
     18    $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() );
    1919    if( $allowed_themes == false )
    2020        $allowed_themes = array();
  • trunk/wp-admin/user-edit.php

    r12722 r12733  
    6262
    6363
    64 // Only allow site admins to edit every user. 
    65 if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID ) 
    66     wp_die( __( 'You do not have permission to edit this user.' ) ); 
    67    
     64// Only allow site admins to edit every user.
     65if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID )
     66    wp_die( __( 'You do not have permission to edit this user.' ) );
     67
    6868switch ($action) {
    6969case 'switchposts':
  • trunk/wp-config-sample.php

    r12674 r12733  
    11<?php
    2 /** 
     2/**
    33 * The base configurations of the WordPress.
    44 *
  • trunk/wp-includes/capabilities.php

    r12699 r12733  
    125125     * The capabilities are defined in the following format `array( 'read' => true );`
    126126     * To explicitly deny a role a capability you set the value for that capability to false.
    127      * 
     127     *
    128128     * @since 2.0.0
    129129     * @access public
     
    717717            $cap = $this->translate_level_to_cap( $cap );
    718718        }
    719        
     719
    720720        $args = array_slice( func_get_args(), 1 );
    721721        $args = array_merge( array( $cap, $this->ID ), $args );
  • trunk/wp-includes/comment.php

    r12680 r12733  
    190190        'ID' => '',
    191191        'karma' => '',
    192         'number' => '', 
    193         'offset' => '', 
    194         'orderby' => '', 
    195         'order' => 'DESC', 
     192        'number' => '',
     193        'offset' => '',
     194        'orderby' => '',
     195        'order' => 'DESC',
    196196        'parent' => '',
    197197        'post_ID' => '',
    198198        'post_id' => 0,
    199         'status' => '', 
     199        'status' => '',
    200200        'type' => '',
    201201        'user_id' => '',
     
    236236        $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby);
    237237        $ordersby = array_intersect(
    238             $ordersby, 
     238            $ordersby,
    239239            array(
    240240                'comment_agent',
     
    277277    if ( ! empty($post_id) )
    278278        $post_where .= $wpdb->prepare( 'comment_post_ID = %d AND ', $post_id );
    279     if ( '' !== $author_email ) 
     279    if ( '' !== $author_email )
    280280        $post_where .= $wpdb->prepare( 'comment_author_email = %s AND ', $author_email );
    281281    if ( '' !== $karma )
     
    283283    if ( 'comment' == $type )
    284284        $post_where .= "comment_type = '' AND ";
    285     elseif ( ! empty( $type ) ) 
     285    elseif ( ! empty( $type ) )
    286286        $post_where .= $wpdb->prepare( 'comment_type = %s AND ', $type );
    287287    if ( '' !== $parent )
  • trunk/wp-includes/default-constants.php

    r12732 r12733  
    2727                }
    2828            }
    29            
     29
    3030            /**
    3131             * The $blog_id global, which you can change in the config allows you to create a simple
     
    3737            if ( ! isset($blog_id) )
    3838                $blog_id = 1;
    39            
     39
    4040            // set memory limits.
    4141            if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) )
    4242                @ini_set('memory_limit', WP_MEMORY_LIMIT);
    43            
     43
    4444            if ( !defined('WP_CONTENT_DIR') )
    4545                define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down
    46            
     46
    4747            // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development.
    4848            if ( !defined('WP_DEBUG') )
    4949                define( 'WP_DEBUG', false );
    50            
     50
    5151            // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On
    5252            if ( !defined('WP_DEBUG_DISPLAY') )
    5353                define( 'WP_DEBUG_DISPLAY', true );
    54            
     54
    5555            // Add define('WP_DEBUG_LOG', true); to enable php debug logging to WP_CONTENT_DIR/debug.log
    5656            if ( !defined('WP_DEBUG_LOG') )
    5757                define('WP_DEBUG_LOG', false);
    58            
     58
    5959            if ( !defined('WP_CACHE') )
    6060                define('WP_CACHE', false);
    61            
     61
    6262            /**
    6363             * Private
     
    6565            if ( !defined('MEDIA_TRASH') )
    6666                define('MEDIA_TRASH', false);
    67            
     67
    6868            if ( !defined('SHORTINIT') )
    6969                define('SHORTINIT', false);
     
    7474            if ( !defined('WP_CONTENT_URL') )
    7575                define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
    76        
     76
    7777            /**
    7878             * Allows for the plugins directory to be moved from the default location.
     
    8282            if ( !defined('WP_PLUGIN_DIR') )
    8383                define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash
    84        
     84
    8585            /**
    8686             * Allows for the plugins directory to be moved from the default location.
     
    9090            if ( !defined('WP_PLUGIN_URL') )
    9191                define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash
    92        
     92
    9393            /**
    9494             * Allows for the plugins directory to be moved from the default location.
     
    109109            if ( !defined('WPMU_PLUGIN_DIR') )
    110110                define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash
    111        
     111
    112112            /**
    113113             * Allows for the mu-plugins directory to be moved from the default location.
     
    117117            if ( !defined('WPMU_PLUGIN_URL') )
    118118                define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash
    119        
     119
    120120            /**
    121121             * Allows for the mu-plugins directory to be moved from the default location.
     
    130130
    131131            global $wp_default_secret_key;
    132        
     132
    133133            /**
    134134             * Used to guarantee unique hash cookies
     
    137137            if( !defined('COOKIEHASH') )
    138138                    define('COOKIEHASH', md5(get_option('siteurl')));
    139        
     139
    140140            /**
    141141             * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php
     
    143143             */
    144144            $wp_default_secret_key = 'put your unique phrase here';
    145        
     145
    146146            /**
    147147             * It is possible to define this in wp-config.php
     
    150150            if ( !defined('USER_COOKIE') )
    151151                define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH);
    152        
     152
    153153            /**
    154154             * It is possible to define this in wp-config.php
     
    157157            if ( !defined('PASS_COOKIE') )
    158158                define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH);
    159        
     159
    160160            /**
    161161             * It is possible to define this in wp-config.php
     
    164164            if ( !defined('AUTH_COOKIE') )
    165165                define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH);
    166        
     166
    167167            /**
    168168             * It is possible to define this in wp-config.php
     
    171171            if ( !defined('SECURE_AUTH_COOKIE') )
    172172                define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH);
    173        
     173
    174174            /**
    175175             * It is possible to define this in wp-config.php
     
    178178            if ( !defined('LOGGED_IN_COOKIE') )
    179179                define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH);
    180        
     180
    181181            /**
    182182             * It is possible to define this in wp-config.php
     
    185185            if ( !defined('TEST_COOKIE') )
    186186                define('TEST_COOKIE', 'wordpress_test_cookie');
    187        
     187
    188188            /**
    189189             * It is possible to define this in wp-config.php
     
    192192            if ( !defined('COOKIEPATH') )
    193193                define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
    194        
     194
    195195            /**
    196196             * It is possible to define this in wp-config.php
     
    199199            if ( !defined('SITECOOKIEPATH') )
    200200                define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
    201        
     201
    202202            /**
    203203             * It is possible to define this in wp-config.php
     
    206206            if ( !defined('ADMIN_COOKIE_PATH') )
    207207                define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
    208        
     208
    209209            /**
    210210             * It is possible to define this in wp-config.php
     
    213213            if ( !defined('PLUGINS_COOKIE_PATH') )
    214214                define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL)  );
    215        
     215
    216216            /**
    217217             * It is possible to define this in wp-config.php
     
    220220            if ( !defined('COOKIE_DOMAIN') )
    221221                define('COOKIE_DOMAIN', false);
    222        
     222
    223223            /**
    224224             * It is possible to define this in wp-config.php
     
    228228                define('FORCE_SSL_ADMIN', false);
    229229            force_ssl_admin(FORCE_SSL_ADMIN);
    230        
     230
    231231            /**
    232232             * It is possible to define this in wp-config.php
     
    236236                define('FORCE_SSL_LOGIN', false);
    237237            force_ssl_login(FORCE_SSL_LOGIN);
    238        
     238
    239239            /**
    240240             * It is possible to define this in wp-config.php
     
    243243            if ( !defined( 'AUTOSAVE_INTERVAL' ) )
    244244                define( 'AUTOSAVE_INTERVAL', 60 );
    245        
     245
    246246            /**
    247247             * It is possible to define this in wp-config.php
     
    265265             */
    266266            define('TEMPLATEPATH', get_template_directory());
    267        
     267
    268268            /**
    269269             * Web Path to the current active template stylesheet directory
  • trunk/wp-includes/default-widgets.php

    r12598 r12733  
    791791    if ( !$rss->get_item_quantity() ) {
    792792        echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>';
    793         $rss->__destruct(); 
     793        $rss->__destruct();
    794794        unset($rss);
    795795        return;
     
    844844    }
    845845    echo '</ul>';
    846     $rss->__destruct(); 
     846    $rss->__destruct();
    847847    unset($rss);
    848848}
  • trunk/wp-includes/deprecated.php

    r12657 r12733  
    508508        'title_li' => '',
    509509    );
    510    
     510
    511511    $r = wp_parse_args( $args, $defaults );
    512512
     
    974974
    975975    $defaults = array(
    976         'after' => '<br />', 
     976        'after' => '<br />',
    977977        'before' => '',
    978978        'between' => ' ',
    979979        'categorize' => 0,
    980         'category' => '', 
     980        'category' => '',
    981981        'echo' => true,
    982         'limit' => -1, 
     982        'limit' => -1,
    983983        'orderby' => 'name',
    984         'show_description' => true, 
    985         'show_images' => true, 
     984        'show_description' => true,
     985        'show_images' => true,
    986986        'show_rating' => false,
    987987        'show_updated' => true,
     
    990990
    991991    $r = wp_parse_args( $args, $defaults );
    992    
     992
    993993    return wp_list_bookmarks($r);
    994994}
  • trunk/wp-includes/formatting.php

    r12680 r12733  
    3434    $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
    3535    $stop = count($textarr);
    36    
     36
    3737    // No need to setup these variables more than once
    3838    if (!$static_setup) {
     
    7575
    7676        if ( !empty($curl) && '<' != $curl{0} && '[' != $curl{0}
    77                 && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) { 
     77                && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
    7878            // This is not a tag, nor is the texturization disabled
    7979            // static strings
     
    121121             * This disables texturize until we find a closing tag of our type
    122122             * (e.g. <pre>) even if there was invalid nesting before that
    123              * 
     123             *
    124124             * Example: in the case <pre>sadsadasd</code>"baba"</pre>
    125125             *          "baba" won't be texturize
     
    691691    foreach ( (array) $parts as $part) {
    692692        $filename .= '.' . $part;
    693        
     693
    694694        if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
    695695            $allowed = false;
     
    24142414 */
    24152415function like_escape($text) {
    2416     return addcslashes($text, '\\%_'); 
     2416    return addcslashes($text, '\\%_');
    24172417}
    24182418
  • trunk/wp-includes/functions.php

    r12727 r12733  
    577577    do_action( "add_option_{$name}", $name, $value );
    578578    do_action( 'added_option', $name, $value );
    579    
     579
    580580    return;
    581581}
     
    23082308        'mid|midi' => 'audio/midi',
    23092309        'wma' => 'audio/wma',
    2310         'mka' => 'audio/x-matroska', 
    2311         'mkv' => 'video/x-matroska', 
     2310        'mka' => 'audio/x-matroska',
     2311        'mkv' => 'video/x-matroska',
    23122312        'rtf' => 'application/rtf',
    23132313        'js' => 'application/javascript',
     
    33933393 * If the transient does not exist or does not have a value, then the return value
    33943394 * will be false.
    3395  * 
     3395 *
    33963396 * @since 2.9.0
    33973397 * @package WordPress
     
    36793679            $selected = 'selected="selected" ';
    36803680        $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
    3681        
     3681
    36823682    }
    36833683    $structure[] = '</optgroup>';
     
    37463746 * Parse the file contents to retrieve its metadata.
    37473747 *
    3748  * Searches for metadata for a file, such as a plugin or theme.  Each piece of 
     3748 * Searches for metadata for a file, such as a plugin or theme.  Each piece of
    37493749 * metadata must be on its own line. For a field spanning multple lines, it
    37503750 * must not have any newlines or only parts of it will be displayed.
     
    37663766 * @param string $file Path to the file
    37673767 * @param bool $markup If the returned data should have HTML markup applied
    3768  * @param string $context If specified adds filter hook "extra_<$context>_headers" 
     3768 * @param string $context If specified adds filter hook "extra_<$context>_headers"
    37693769 */
    37703770function get_file_data( $file, $default_headers, $context = '' ) {
     
    37903790    }
    37913791
    3792    
     3792
    37933793    foreach ( $all_headers as $field => $regex ) {
    37943794        preg_match( '/' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field});
     
    38003800
    38013801    $file_data = compact( array_keys( $all_headers ) );
    3802    
     3802
    38033803    return $file_data;
    38043804}
    38053805/*
    38063806 * Used internally to tidy up the search terms
    3807  * 
     3807 *
    38083808 * @private
    38093809 * @since 2.9.0
  • trunk/wp-includes/general-template.php

    r12701 r12733  
    211211                        'label_username' => __( 'Username' ),
    212212                        'label_password' => __( 'Password' ),
    213                         'label_remember' => __( 'Remember Me' ), 
    214                         'label_log_in' => __( 'Log In' ), 
    215                         'id_username' => 'user_login', 
    216                         'id_password' => 'user_pass', 
    217                         'id_remember' => 'rememberme', 
    218                         'id_submit' => 'wp-submit', 
    219                         'remember' => true, 
     213                        'label_remember' => __( 'Remember Me' ),
     214                        'label_log_in' => __( 'Log In' ),
     215                        'id_username' => 'user_login',
     216                        'id_password' => 'user_pass',
     217                        'id_remember' => 'rememberme',
     218                        'id_submit' => 'wp-submit',
     219                        'remember' => true,
    220220                        'value_username' => '',
    221221                        'value_remember' => false, // Set this to true to default the "Remember me" checkbox to checked
    222222                    );
    223223    $args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
    224    
     224
    225225    $form = '
    226226        <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . site_url( 'wp-login.php', 'login' ) . '" method="post">
     
    242242            ' . do_action( 'login_form_bottom' ) . '
    243243        </form>';
    244        
     244
    245245    if ( $args['echo'] )
    246246        echo $form;
     
    13021302 */
    13031303function the_modified_date($d = '', $before='', $after='', $echo = true) {
    1304    
     1304
    13051305    $the_modified_date = $before . get_the_modified_date($d) . $after;
    13061306    $the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
    1307    
     1307
    13081308    if ( $echo )
    13091309        echo $the_modified_date;
    13101310    else
    13111311        return $the_modified_date;
    1312    
     1312
    13131313}
    13141314
  • trunk/wp-includes/js/autosave.dev.js

    r12022 r12733  
    33jQuery(document).ready( function($) {
    44    var dotabkey = true;
    5    
     5
    66    autosaveLast = $('#post #title').val() + $('#post #content').val();
    77    autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true});
  • trunk/wp-includes/js/quicktags.dev.js

    r10745 r12733  
    334334function edInsertContent(myField, myValue) {
    335335    var sel, startPos, endPos, scrollTop;
    336    
     336
    337337    //IE support
    338338    if (document.selection) {
  • trunk/wp-includes/js/wp-list-revisions.dev.js

    r12502 r12733  
    88                checkCount += inputs[i].checked ? 1 : 0;
    99                side = inputs[i].getAttribute('name');
    10                 if ( ! inputs[i].checked && 
     10                if ( ! inputs[i].checked &&
    1111                ( 'left' == side && 1 > checkCount || 'right' == side && 1 < checkCount && ( ! inputs[i-1] || ! inputs[i-1].checked ) ) &&
    1212                ! ( inputs[i+1] && inputs[i+1].checked && 'right' == inputs[i+1].getAttribute('name') ) )
    13                     inputs[i].style.visibility = 'hidden';     
     13                    inputs[i].style.visibility = 'hidden';
    1414                else if ( 'left' == side || 'right' == side )
    1515                    inputs[i].style.visibility = 'visible';
     
    1818        pr.onclick();
    1919    }
    20     if ( w && w.addEventListener ) 
     20    if ( w && w.addEventListener )
    2121        w.addEventListener('load', init, false);
    2222    else if ( w && w.attachEvent )
  • trunk/wp-includes/l10n.php

    r12594 r12733  
    314314function load_textdomain( $domain, $mofile ) {
    315315    global $l10n;
    316    
     316
    317317    $plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
    318    
     318
    319319    if ( true == $plugin_override ) {
    320320        return true;
    321321    }
    322    
     322
    323323    do_action( 'load_textdomain', $domain, $mofile );
    324        
     324
    325325    $mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
    326326
     
    334334
    335335    $l10n[$domain] = &$mo;
    336    
     336
    337337    return true;
    338338}
     
    378378        $path = WP_PLUGIN_DIR;
    379379    }
    380    
     380
    381381    $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
    382382    return load_textdomain( $domain, $mofile );
  • trunk/wp-includes/link-template.php

    r12680 r12733  
    683683        $action = '&action=edit';
    684684
    685     $post_type_object = get_post_type_object( $post->post_type ); 
     685    $post_type_object = get_post_type_object( $post->post_type );
    686686    if ( !$post_type_object )
    687687        return;
     
    10991099    if ( empty($posts) )
    11001100        return;
    1101    
     1101
    11021102    // Even though we limited get_posts to return only 1 item it still returns an array of objects.
    11031103    $post = $posts[0];
  • trunk/wp-includes/media.php

    r12659 r12733  
    746746    $columns = intval($columns);
    747747    $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
    748     $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left'; 
    749    
     748    $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left';
     749
    750750    $selector = "gallery-{$instance}";
    751751
  • trunk/wp-includes/ms-deprecated.php

    r12645 r12733  
    1212 * Deprecated functions come here to die.
    1313 */
    14  
     14
    1515/**
    1616 * @since unknown
  • trunk/wp-includes/ms-functions.php

    r12730 r12733  
    13741374    if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") )
    13751375        die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>');
    1376        
     1376
    13771377    $wpdb->suppress_errors(false);
    13781378
     
    14031403
    14041404    $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
    1405    
     1405
    14061406    if ( $blogroll_id == null ) {
    14071407        $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) );
  • trunk/wp-includes/pluggable.php

    r12653 r12733  
    977977
    978978    $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
    979    
     979
    980980    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
    981981    // we want to reverse this for the plain text arena of emails.
     
    10731073    $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
    10741074    $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
    1075    
     1075
    10761076    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
    10771077    // we want to reverse this for the plain text arena of emails.
    10781078    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
    1079    
     1079
    10801080    switch ($comment->comment_type)
    10811081    {
     
    11651165    $user_login = stripslashes($user->user_login);
    11661166    $user_email = stripslashes($user->user_email);
    1167    
     1167
    11681168    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
    11691169    // we want to reverse this for the plain text arena of emails.
  • trunk/wp-includes/plugin.php

    r12641 r12733  
    302302    if ( ! isset($wp_actions) )
    303303        $wp_actions = array();
    304    
     304
    305305    if ( ! isset($wp_actions[$tag]) )
    306306        $wp_actions[$tag] = 1;
     
    388388    if ( ! isset($wp_actions) )
    389389        $wp_actions = array();
    390    
     390
    391391    if ( ! isset($wp_actions[$tag]) )
    392392        $wp_actions[$tag] = 1;
  • trunk/wp-includes/post-thumbnail-template.php

    r12605 r12733  
    1212/**
    1313 * Check if post has an image attached.
    14  * 
     14 *
    1515 * @since 2.9.0
    1616 *
     
    2626/**
    2727 * Retrieve Post Thumbnail ID.
    28  * 
     28 *
    2929 * @since 2.9.0
    3030 *
     
    4040/**
    4141 * Display Post Thumbnail.
    42  * 
     42 *
    4343 * @since 2.9.0
    4444 *
     
    5252/**
    5353 * Retrieve Post Thumbnail.
    54  * 
     54 *
    5555 * @since 2.9.0
    5656 *
  • trunk/wp-includes/post.php

    r12719 r12733  
    684684/**
    685685 * Register support of certain features for a post type.
    686  * 
     686 *
    687687 * @since 3.0
    688688 * @param string $post_type The post type for which to add the feature
     
    21522152 * Given the desired slug and some post details computes a unique slug for the post.
    21532153 *
    2154  * @global wpdb $wpdb 
    2155  * @global WP_Rewrite $wp_rewrite 
     2154 * @global wpdb $wpdb
     2155 * @global WP_Rewrite $wp_rewrite
    21562156 * @param string $slug the desired slug (post_name)
    21572157 * @param integer $post_ID
  • trunk/wp-includes/query.php

    r12597 r12733  
    333333/**
    334334 * Whether current page view is the blog homepage.
    335  * 
     335 *
    336336 * This is the page which is showing the time based blog content of your site
    337337 * so if you set a static page for the front page of your site then this will
    338  * only be true on the page which you set as the "Posts page" in Reading Settings. 
     338 * only be true on the page which you set as the "Posts page" in Reading Settings.
    339339 *
    340340 * @since 1.5.0
     
    20662066            $post_type_object = get_post_type_object ( $post_type );
    20672067            if ( !empty($post_type_object) )
    2068                 $post_type_cap = $post_type_object->capability_type; 
     2068                $post_type_cap = $post_type_object->capability_type;
    20692069            else
    20702070                $post_type_cap = $post_type;
     
    20782078            $where .= $exclude_post_types;
    20792079        } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
    2080             $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')"; 
     2080            $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
    20812081        } elseif ( ! empty( $post_type ) ) {
    20822082            $where .= " AND $wpdb->posts.post_type = '$post_type'";
  • trunk/wp-includes/registration.php

    r12468 r12733  
    119119    $user_login = sanitize_user($user_login, true);
    120120    $user_login = apply_filters('pre_user_login', $user_login);
    121    
     121
    122122    //Remove any non-printable chars from the login string to see if we have ended up with an empty username
    123123    $user_login = trim($user_login);
    124    
     124
    125125    if ( empty($user_login) ) {
    126126        return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
    127127    }
    128    
     128
    129129    if ( empty($user_nicename) )
    130130        $user_nicename = sanitize_title( $user_login );
  • trunk/wp-includes/rewrite.php

    r12700 r12733  
    787787        //get pages in order of hierarchy, i.e. children after parents
    788788        $posts = get_page_hierarchy($wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'"));
    789        
     789
    790790        // If we have no pages get out quick
    791791        if ( !$posts )
     
    17361736                $extra_indent = $indent.$indent.$indent.$indent;
    17371737            }
    1738    
     1738
    17391739            $rules .= $extra_indent."<rule name=\"wordpress\" patternSyntax=\"Wildcard\">".$end_of_line;
    17401740            $rules .= $extra_indent.$indent."<match url=\"*\" />".$end_of_line;
     
    17451745            $rules .= $extra_indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line;
    17461746            $rules .= $extra_indent."</rule>";
    1747    
     1747
    17481748            if ( $add_parent_tags ) {
    17491749                $rules .= $end_of_line.$indent.$indent.$indent."</rules>".$end_of_line;
  • trunk/wp-includes/script-loader.php

    r12678 r12733  
    177177            'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};'
    178178    ) );
    179    
     179
    180180
    181181    $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8');
  • trunk/wp-includes/taxonomy.php

    r12729 r12733  
    576576 * 'exclude' is ignored.
    577577 *
    578  * exclude_tree - Default is an empty array.  An array, comma- or space-delimited 
    579  * string of term ids to exclude from the return array, along with all of their 
    580  * descendant terms according to the primary taxonomy.  If 'include' is non-empty, 
     578 * exclude_tree - Default is an empty array.  An array, comma- or space-delimited
     579 * string of term ids to exclude from the return array, along with all of their
     580 * descendant terms according to the primary taxonomy.  If 'include' is non-empty,
    581581 * 'exclude_tree' is ignored.
    582582 *
  • trunk/wp-includes/theme.php

    r12598 r12733  
    171171 */
    172172function get_theme_data( $theme_file ) {
    173     $default_headers = array( 
    174         'Name' => 'Theme Name', 
    175         'URI' => 'Theme URI', 
    176         'Description' => 'Description', 
    177         'Author' => 'Author', 
     173    $default_headers = array(
     174        'Name' => 'Theme Name',
     175        'URI' => 'Theme URI',
     176        'Description' => 'Description',
     177        'Author' => 'Author',
    178178        'AuthorURI' => 'Author URI',
    179         'Version' => 'Version', 
    180         'Template' => 'Template', 
    181         'Status' => 'Status', 
     179        'Version' => 'Version',
     180        'Template' => 'Template',
     181        'Status' => 'Status',
    182182        'Tags' => 'Tags'
    183183        );
     
    371371        $template_files = array_unique($template_files);
    372372        $stylesheet_files = array_unique($stylesheet_files);
    373            
     373
    374374        $template_dir = dirname($template_files[0]);
    375375        $stylesheet_dir = dirname($stylesheet_files[0]);
     
    13141314/**
    13151315 * Allows a theme to register its support of a certain feature
    1316  * 
     1316 *
    13171317 * Must be called in the themes functions.php file to work.
    13181318 *
  • trunk/wp-includes/user.php

    r12699 r12733  
    641641            $vars = get_object_vars($user);
    642642        foreach ( array_keys($vars) as $field ) {
    643             if ( is_string($user->$field) || is_numeric($user->$field) ) 
     643            if ( is_string($user->$field) || is_numeric($user->$field) )
    644644                $user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context);
    645645        }
  • trunk/wp-includes/wp-db.php

    r12668 r12733  
    806806        if ( defined('SAVEQUERIES') && SAVEQUERIES )
    807807            $this->timer_start();
    808        
     808
    809809        // use $this->dbh for read ops, and $this->dbhwrite for write ops
    810810        // use $this->dbhglobal for gloal table ops
  • trunk/wp-signup.php

    r12689 r12733  
    3030function wpmu_signup_stylesheet() {
    3131    ?>
    32     <style type="text/css"> 
     32    <style type="text/css">
    3333        .mu_register { width: 90%; margin:0 auto; }
    3434        .mu_register form { margin-top: 2em; }
     
    3636        .mu_register input[type="submit"],
    3737            .mu_register #blog_title,
    38             .mu_register #user_email, 
     38            .mu_register #user_email,
    3939            .mu_register #blogname,
    40             .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; } 
     40            .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; }
    4141        .mu_register .prefix_address,
    42             .mu_register .suffix_address {font-size: 18px;display:inline; }         
     42            .mu_register .suffix_address {font-size: 18px;display:inline; }
    4343        .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; }
    4444        .mu_register label.checkbox { display:inline; }
     
    8383    // Blog Title
    8484    ?>
    85     <label for="blog_title"><?php _e('Blog Title:') ?></label> 
     85    <label for="blog_title"><?php _e('Blog Title:') ?></label>
    8686    <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?>
    8787        <p class="error"><?php echo $errmsg ?></p>
     
    9393        <p class="privacy-intro">
    9494            <label for="blog_public_on"><?php _e('Privacy:') ?></label>
    95             <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 
     95            <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?>
    9696            <div style="clear:both;"></div>
    9797            <label class="checkbox" for="blog_public_on">
     
    105105        </p>
    106106    </div>
    107    
     107
    108108    <?php
    109109    do_action('signup_blogform', $errors);
     
    131131    <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?>
    132132        <p class="error"><?php echo $errmsg ?></p>
    133     <?php } ?>     
     133    <?php } ?>
    134134    <input name="user_email" type="text" id="user_email" value="<?php  echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We&#8217;ll send your password to this address, so <strong>triple-check it</strong>.)') ?>
    135135    <?php
     
    146146function signup_another_blog($blogname = '', $blog_title = '', $errors = '') {
    147147    global $current_user, $current_site;
    148    
     148
    149149    if ( ! is_wp_error($errors) ) {
    150150        $errors = new WP_Error();
     
    164164    ?>
    165165    <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p>
    166    
    167     <?php
    168     $blogs = get_blogs_of_user($current_user->ID); 
     166
     167    <?php
     168    $blogs = get_blogs_of_user($current_user->ID);
    169169    if ( !empty($blogs) ) { ?>
    170170        <p>
     
    177177        </p>
    178178    <?php } ?>
    179    
     179
    180180    <p><?php _e("If you&#8217;re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p>
    181181    <form id="setupform" method="post" action="wp-signup.php">
     
    239239
    240240    ?>
    241    
     241
    242242    <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2>
    243243    <form id="setupform" method="post" action="wp-signup.php">
     
    245245        <?php do_action( "signup_hidden_fields" ); ?>
    246246        <?php show_user_form($user_name, $user_email, $errors); ?>
    247        
     247
    248248        <p>
    249249        <?php if( $active_signup == 'blog' ) { ?>
     
    253253        <?php } else { ?>
    254254            <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> />
    255             <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>   
    256             <br />         
    257             <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />         
     255            <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label>
     256            <br />
     257            <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> />
    258258            <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label>
    259259        <?php } ?>
    260260        </p>
    261        
     261
    262262        <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
    263263    </form>
     
    351351    ?>
    352352    <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
    353    
     353
    354354    <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p>
    355355    <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'),  $user_email) ?></p>
Note: See TracChangeset for help on using the changeset viewer.