Changeset 8600

Show
Ignore:
Timestamp:
08/09/08 05:36:14 (4 months ago)
Author:
ryan
Message:

Trailing whitespace cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8490 r8600  
    1414    $s = $_GET['q']; // is this slashed already? 
    1515 
    16     if ( strstr( $s, ',' ) ) {  
    17         $s = explode( ',', $s );  
    18         $s = $s[count( $s ) - 1];  
     16    if ( strstr( $s, ',' ) ) { 
     17        $s = explode( ',', $s ); 
     18        $s = $s[count( $s ) - 1]; 
    1919    } 
    2020    $s = trim( $s ); 
    …… 
    279279        $x->send(); 
    280280    } 
    281      
     281 
    282282    $cat = wp_insert_category( $_POST, true ); 
    283283 

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

    r8419 r8600  
    7575 
    7676<?php 
    77 if ( ! $is_opera ) {  
     77if ( ! $is_opera ) { 
    7878?> 
    7979    <div id="gears-info-box" class="info-box" style="display:none;"> 
    …… 
    9090    <div id="gears-msg2" style="display:none;"> 
    9191    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 
    92     <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p>  
    93     <p><?php  
    94      
     92    <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
     93    <p><?php 
     94 
    9595    if ( $is_safari ) 
    9696        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.'); 
    9797    else 
    98         _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.');  
    99      
     98        _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
     99 
    100100    ?></p> 
    101101    <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> 
    …… 
    107107    <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> 
    108108    <p><?php 
    109      
     109 
    110110    if ( $is_safari ) 
    111111        _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.'); 
    112112    else 
    113         _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.');  
    114      
     113        _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
     114 
    115115    ?></p> 
    116116    <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> 

  • trunk/wp-admin/async-upload.php

    r8190 r8600  
    2323    wp_die(__('You do not have permission to upload files.')); 
    2424 
    25 // just fetch the detail form for that attachment   
     25// just fetch the detail form for that attachment 
    2626if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { 
    2727    echo get_media_item($id); 

  • trunk/wp-admin/css/colors-classic.css

    r8540 r8600  
    555555/* TinyMCE */ 
    556556.wp_themeSkin *, 
    557 .wp_themeSkin a:hover,  
    558 .wp_themeSkin a:link,  
    559 .wp_themeSkin a:visited,  
     557.wp_themeSkin a:hover, 
     558.wp_themeSkin a:link, 
     559.wp_themeSkin a:visited, 
    560560.wp_themeSkin a:active { 
    561561     color: #000; 
    …… 
    578578 
    579579/* Button */ 
    580 .wp_themeSkin .mceButton {  
     580.wp_themeSkin .mceButton { 
    581581    background-color: #e9e8e8; 
    582582    border-color: #83B4D5; 
    …… 
    584584 
    585585.wp_themeSkin a.mceButtonEnabled:hover, 
    586 .wp_themeSkin a.mceButtonActive,  
     586.wp_themeSkin a.mceButtonActive, 
    587587.wp_themeSkin a.mceButtonSelected { 
    588588    background-color: #d6d8da; 
    …… 
    601601} 
    602602 
    603 .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,  
     603.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
    604604.wp_themeSkin .mceListBoxHover .mceOpen, 
    605605.wp_themeSkin .mceListBoxSelected .mceOpen, 
    …… 
    609609} 
    610610 
    611 .wp_themeSkin table.mceListBoxEnabled:hover .mceText,  
     611.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
    612612.wp_themeSkin .mceListBoxHover .mceText { 
    613613    border-color: #7789ba !important; 
    …… 
    615615 
    616616.wp_themeSkin select.mceListBox { 
    617     border-color: #b3c7e1;  
     617    border-color: #b3c7e1; 
    618618    background-color: #fff; 
    619619} 
    620620 
    621621/* SplitButton */ 
    622 .wp_themeSkin .mceSplitButton a.mceAction,  
     622.wp_themeSkin .mceSplitButton a.mceAction, 
    623623.wp_themeSkin .mceSplitButton a.mceOpen { 
    624624    background-color: #e9e8e8; 
    …… 
    632632    background-color: #d6d8da; 
    633633    border-color: #7789ba !important; 
    634 }  
     634} 
    635635 
    636636.wp_themeSkin .mceSplitButtonActive { 
    …… 
    671671 
    672672.wp_themeSkin .mceMenu .mceText { 
    673     color: #000;  
     673    color: #000; 
    674674} 
    675675 
    …… 
    682682} 
    683683.wp_themeSkin .mceMenuItemTitle a { 
    684     background-color: #ccc;  
     684    background-color: #ccc; 
    685685    border-bottom-color: #aaa; 
    686686} 

  • trunk/wp-admin/css/colors-fresh.css

    r8540 r8600  
    3838#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, 
    3939#dragHelper li.widget-list-control-item h4.widget-title a, 
    40 #draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover,  
     40#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
    4141#plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited { 
    4242    color: #fff; 
    …… 
    527527/* TinyMCE */ 
    528528.wp_themeSkin *, 
    529 .wp_themeSkin a:hover,  
    530 .wp_themeSkin a:link,  
    531 .wp_themeSkin a:visited,  
     529.wp_themeSkin a:hover, 
     530.wp_themeSkin a:link, 
     531.wp_themeSkin a:visited, 
    532532.wp_themeSkin a:active { 
    533533     color: #000; 
    …… 
    550550 
    551551/* Button */ 
    552 .wp_themeSkin .mceButton {  
     552.wp_themeSkin .mceButton { 
    553553    background-color: #e9e8e8; 
    554554    border-color: #abc0fb; 
    …… 
    556556 
    557557.wp_themeSkin a.mceButtonEnabled:hover, 
    558 .wp_themeSkin a.mceButtonActive,  
     558.wp_themeSkin a.mceButtonActive, 
    559559.wp_themeSkin a.mceButtonSelected { 
    560560    background-color: #d6d8da; 
    …… 
    573573} 
    574574 
    575 .wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,  
     575.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
    576576.wp_themeSkin .mceListBoxHover .mceOpen, 
    577577.wp_themeSkin .mceListBoxSelected .mceOpen, 
    …… 
    581581} 
    582582 
    583 .wp_themeSkin table.mceListBoxEnabled:hover .mceText,  
     583.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
    584584.wp_themeSkin .mceListBoxHover .mceText { 
    585585    border-color: #7789ba !important; 
    …… 
    587587 
    588588.wp_themeSkin select.mceListBox { 
    589     border-color: #b3c7e1;  
     589    border-color: #b3c7e1; 
    590590    background-color: #fff; 
    591591} 
    592592 
    593593/* SplitButton */ 
    594 .wp_themeSkin .mceSplitButton a.mceAction,  
     594.wp_themeSkin .mceSplitButton a.mceAction, 
    595595.wp_themeSkin .mceSplitButton a.mceOpen { 
    596596    background-color: #e9e8e8; 
    …… 
    604604    background-color: #d6d8da; 
    605605    border-color: #7789ba !important; 
    606 }  
     606} 
    607607 
    608608.wp_themeSkin .mceSplitButtonActive { 
    …… 
    643643 
    644644.wp_themeSkin .mceMenu .mceText { 
    645     color: #000;  
     645    color: #000; 
    646646} 
    647647 
    …… 
    654654} 
    655655.wp_themeSkin .mceMenuItemTitle a { 
    656     background-color: #ccc;  
     656    background-color: #ccc; 
    657657    border-bottom-color: #aaa; 
    658658} 

  • trunk/wp-admin/css/dashboard-rtl.css

    r8327 r8600  
    2626    font-family: sans-serif !important; 
    2727} 
    28      
     28 
    2929#dashboard-widgets .widget_rss ul li a { 
    3030    float:right; 

  • trunk/wp-admin/css/dashboard.css

    r7453 r8600  
    6767} 
    6868 
    69 div.dashboard-widget-holder {   
     69div.dashboard-widget-holder { 
    7070    margin-top: 20px; 
    7171    width: 50%; 
    …… 
    158158    border-radius: 3px; 
    159159    cursor: pointer; 
    160     text-decoration: none;  
     160    text-decoration: none; 
    161161} 
    162162 

  • trunk/wp-admin/css/global-rtl.css

    r8327 r8600  
    99.textleft { text-align: right; } 
    1010.textright { text-align: left; } 
    11      
     11 
    1212.wrap h2 { font-family: sans-serif; } 
    1313 

  • trunk/wp-admin/css/ie-rtl.css

    r8590 r8600  
    44} 
    55 
    6 #wpcontent #sidemenu li a {  
    7     float: left;  
     6#wpcontent #sidemenu li a { 
     7    float: left; 
    88} 
    99 
    …… 
    6060 
    6161/* Search box gets stuck to the right, hidden outside view */ 
    62 * html #post-search, * html #widget-search {  
     62* html #post-search, * html #widget-search { 
    6363    height: 1% !important; 
    6464    right: 600px !important; 
    …… 
    7676 
    7777/* Bad floating in the sub-sub-sub menu makes links un-clickable */ 
    78 * html .subsubsub li {  
     78* html .subsubsub li { 
    7979    display: block; float: right; margin: 0 2px; 
    8080} 
    …… 
    8686 
    8787/* Theme selector on theme edit page gets stuck to the left, hidden outside view */ 
    88 * html #themeselector {  
     88* html #themeselector { 
    8989    position: static; 
    9090} 
    …… 
    9292/* Template edit area floats beneath template list, gets RTLed */ 
    9393* html #template { 
    94     float: right;  
     94    float: right; 
    9595    overflow: hidden; 
    96     width: 755px !important;  
     96    width: 755px !important; 
    9797} 
    9898* html #template #newcontent { 

  • trunk/wp-admin/css/login.css

    r7187 r8600  
    3131    border-radius: 3px; 
    3232    cursor: default; 
    33     text-decoration: none;  
     33    text-decoration: none; 
    3434    margin-top: -6px; 
    3535} 

  • trunk/wp-admin/css/media-rtl.css

    r7398 r8600  
    77    float: right; 
    88    padding: 0 25px 0 0; 
    9     margin: 5px 3px 5px 5px;  
     9    margin: 5px 3px 5px 5px; 
    1010} 
    1111.align .field input { 

  • trunk/wp-admin/css/press-this-rtl.css

    r8328 r8600  
    33} 
    44 
    5 #viewsite {  
    6     right:auto; left: 8px;  
     5#viewsite { 
     6    right:auto; left: 8px; 
    77} 
    88 
    9 ul#menu {  
    10     padding-right: 8px;  
     9ul#menu { 
     10    padding-right: 8px; 
    1111} 
    1212 
    13 .ui-tabs-nav li {  
    14     float: right;  
     13.ui-tabs-nav li { 
     14    float: right; 
    1515} 
    1616 
    17 div#posting {  
    18     padding-right:16px; padding-left: 0;  
     17div#posting { 
     18    padding-right:16px; padding-left: 0; 
    1919} 
    2020 
    21 div#categories {  
    22     right: auto; left: 16px;  
     21div#categories { 
     22    right: auto; left: 16px; 
    2323} 
    2424 
    25 div#categories h2 {  
    26     margin:0.5em 1em 0.5em 0;  
     25div#categories h2 { 
     26    margin:0.5em 1em 0.5em 0; 
    2727} 
    2828 
    29 #jaxtag {  
    30     padding-right :1em; padding-left: 0;  
     29#jaxtag { 
     30    padding-right :1em; padding-left: 0; 
    3131} 
    3232 
    33 input#newtag {  
    34     margin-left: 4px; width: 100px;  
     33input#newtag { 
     34    margin-left: 4px; width: 100px; 
    3535} 
    3636 
    37 #photo_directions span {  
    38     right: auto; left: 3px  
     37#photo_directions span { 
     38    right: auto; left: 3px 
    3939} 
    4040 
    41 #TB_ajaxContent #options {  
    42     right: auto; left: 25px;  
     41#TB_ajaxContent #options { 
     42    right: auto; left: 25px; 
    4343} 
    4444 
    …… 
    5151} 
    5252 
    53 .video_split #extra_fields {  
    54     float: right;  
     53.video_split #extra_fields { 
     54    float: right; 
    5555} 
    5656 
    57 .video_split .editor_area {  
    58     float: left;  
     57.video_split .editor_area { 
     58    float: left; 
    5959} 

  • trunk/wp-admin/css/press-this.css

    r8551 r8600  
    8787 
    8888.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active, 
    89 .ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited {  
     89.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { 
    9090    cursor: pointer; 
    9191} 
    …… 
    262262    border: 2px solid #ccc; 
    263263    margin: 0 4px 4px 0; 
    264 }  
     264} 
    265265#img_container a:hover, #img_container a:active { 
    266266    border: 2px solid #000; 
    …… 
    300300    padding: 3px; 
    301301    margin-right: 5px; 
    302     width: 16em;    
     302    width: 16em; 
    303303} 
    304304 

  • trunk/wp-admin/css/widgets.css

    r7977 r8600  
    113113} 
    114114 
    115 li.widget-list-control-item h4,  
    116 #dragHelper li.widget-list-control-item h4,  
     115li.widget-list-control-item h4, 
     116#dragHelper li.widget-list-control-item h4, 
    117117li.widget-sortable h4 { 
    118118    margin: 0; 

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

    r7998 r8600  
    2828        if ( 1 == $step ) 
    2929            wp_enqueue_script('colorpicker'); 
    30         elseif ( 2 == $step )   
     30        elseif ( 2 == $step ) 
    3131            wp_enqueue_script('cropper'); 
    3232    } 

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

    r8589 r8600  
    106106<p> 
    107107<select name='post_status' id='post_status' tabindex='4'> 
    108 <?php  
    109 // only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability)  
     108<?php 
     109// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) 
    110110if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) : 
    111111?> 

  • trunk/wp-admin/edit-link-categories.php

    r8388 r8600  
    1212        $cat_name = get_term_field('name', $cat_ID, 'link_category'); 
    1313        $default_cat_id = get_option('default_link_category'); 
    14          
     14 
    1515        // Don't delete the default cats. 
    1616        if ( $cat_ID == $default_cat_id ) 

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

    r8589 r8600  
    117117<div id="categories-all" class="ui-tabs-panel"> 
    118118    <ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> 
    119         <?php  
     119        <?php 
    120120        if ( isset($link->link_id) ) 
    121121            wp_link_category_checklist($link->link_id); 

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

    r8589 r8600  
    9191<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages') 
    9292// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown) 
    93 if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) :  
     93if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : 
    9494?> 
    9595<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option> 
    …… 
    102102</select> 
    103103</p> 
    104 <?php if ( current_user_can( 'publish_posts' ) ) : ?>  
     104<?php if ( current_user_can( 'publish_posts' ) ) : ?> 
    105105<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p> 
    106106<?php endif; ?> 
    …… 
    210210 
    211211 
    212 <?php  
     212<?php 
    213213function page_custom_meta_box($post){ 
    214214?> 
    …… 
    239239<p><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></p> 
    240240<p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p> 
    241 <?php  
     241<?php 
    242242} 
    243243add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core'); 

  • trunk/wp-admin/gears-manifest.php

    r8517 r8600  
    4747        if ( is_bool( $style->extra['rtl'] ) ) 
    4848            $rtl_href = str_replace( '.css', '-rtl.css', $src ); 
    49         else  
     49        else 
    5050            $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); 
    5151 

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

    r7999 r8600  
    225225                wp_create_categories($post->categories, $post_id); 
    226226            } 
    227              
     227 
    228228             // Add tags or keywords 
    229229            if ( 1 < strlen($post->post_keywords) ) { 
    230                 // Keywords exist.  
     230                // Keywords exist. 
    231231                printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords)); 
    232232                wp_add_post_tags($post_id, $post->post_keywords); 

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

    r7965 r8600  
    340340        if ( $post_ID && !empty($this->post_ids_processed[$post_ID]) ) // Processed already 
    341341            return 0; 
    342          
     342 
    343343        set_time_limit( 60 ); 
    344344 

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

    r8279 r8600  
    104104                 if ( in_array( intval($category->term_id),  $this->hybrids_ids ) ) 
    105105                    echo ' <a href="#note"> * </a>'; 
    106                  
     106 
    107107                if ( isset($hier[$category->term_id]) ) 
    108108                    $this->_category_children($category, $hier); ?></li> 
    …… 
    244244                    if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) ) 
    245245                        $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug)); 
    246                      
     246 
    247247                    $id = $id['term_taxonomy_id']; 
    248248                    $posts = get_objects_in_term($category->term_id, 'category'); 
    …… 
    253253                        clean_post_cache($post); 
    254254                    } 
    255                      
     255 
    256256                    if ( $values ) { 
    257257                        $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)"); 
    …… 
    263263                    continue; 
    264264                } 
    265                  
     265 
    266266                // if tag already exists, add it to all posts in the category 
    267267                if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) { 

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

    r7693 r8600  
    121121    if ( $update ) { 
    122122        $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_url = %s, 
    123             link_name = %s, link_image = %s, link_target = %s,  
    124             link_visible = %s, link_description = %s, link_rating = %s,  
     123            link_name = %s, link_image = %s, link_target = %s, 
     124            link_visible = %s, link_description = %s, link_rating = %s, 
    125125            link_rel = %s, link_notes = %s, link_rss = %s 
    126126            WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id) ); 
    127127    } else { 
    128         $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",  
     128        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", 
    129129        $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss) ); 
    130130        $link_id = (int) $wpdb->insert_id; 

  • trunk/wp-admin/includes/class-wp-filesystem-base.php

    r8255 r8600  
    33    var $verbose = false; 
    44    var $cache = array(); 
    5      
     5 
    66    var $method = ''; 
    7      
     7 
    88    function abspath() { 
    9         if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false )  
     9        if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false ) 
    1010            return FTP_BASE; 
    1111        return $this->find_folder(ABSPATH); 
    1212    } 
    1313    function wp_content_dir() { 
    14         if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false )  
     14        if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false ) 
    1515            return FTP_CONTENT_DIR; 
    1616        return $this->find_folder(WP_CONTENT_DIR); 
    1717    } 
    1818    function wp_plugins_dir() { 
    19         if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false )  
     19        if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false ) 
    2020            return FTP_PLUGIN_DIR; 
    2121        return $this->find_folder(WP_PLUGIN_DIR); 
    …… 
    3434        return $this->abspath(); 
    3535    } 
    36      
     36 
    3737    function find_folder($folder) { 
    3838        $folder = str_replace('\\', '/', $folder); //Windows Sanitiation 
    …… 
    4848        return $return; 
    4949    } 
    50      
     50 
    5151    // Assumes $folder is windows sanitized; 
    5252    // Assumes that the drive letter is safe to be stripped off, Should not be a problem for windows servers. 
    …… 
    5454        if ( empty( $base ) || '.' == $base ) 
    5555            $base = trailingslashit($this->cwd()); 
    56          
     56 
    5757        $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there. 
    58          
     58 
    5959        $folder_parts = explode('/', $folder); 
    6060        $last_path = $folder_parts[ count($folder_parts) - 1 ]; 
    61          
     61 
    6262        $files = $this->dirlist( $base ); 
    63          
     63 
    6464        foreach ( $folder_parts as $key ) { 
    6565            if ( $key == $last_path ) 
    6666                continue; //We want this to be caught by the next code block. 
    6767 
    68             //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,  
    69             // If its found, change into it and follow through looking for it.  
     68            //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder, 
     69            // If its found, change into it and follow through looking for it. 
    7070            // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on. 
    7171            // If it reaches the end, and still cant find it, it'll return false for the entire function. 
    …… 
    7979            } 
    8080        } 
    81          
     81 
    8282        //Only check this as a last resort, to prevent locating the incorrect install. All above proceeedures will fail quickly if this is the right branch to take. 
    8383        if(isset( $files[ $last_path ] ) ) { 
    …… 
    8989            return false;//Prevent tihs function looping again. 
    9090        //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups. 
    91         return $this->search_for_folder($folder, '/', true);  
    92          
     91        return $this->search_for_folder($folder, '/', true); 
     92 
    9393    } 
    94      
     94 
    9595    //Common Helper functions. 
    9696    function gethchmod($file){ 
    …… 
    144144           if($key = array_search($attarray[$i], $legal)) 
    145145               $realmode .= $legal[$key]; 
    146                 
     146 
    147147        $mode = str_pad($realmode, 9, '-'); 
    148148        $trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1'); 
    149149        $mode = strtr($mode,$trans); 
    150          
     150 
    151151        $newmode = ''; 
    152152        $newmode .= $mode[0] + $mode[1] + $mode[2]; 

  • trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

    r8540 r8600  
    8383        $this->permission = $perm; 
    8484    } 
    85      
     85 
    8686    function get_contents($file, $type = '', $resumepos = 0 ){ 
    8787        if( empty($type) ){ 

  • trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

    r8018 r8600  
    126126        $temp = wp_tempnam( $file ); 
    127127        if ( ! $temphandle = fopen($temp, 'w+') ){ 
    128             unlink($temp);      
     128            unlink($temp); 
    129129            return false; 
    130130        } 
    …… 
    147147        return $this->ftp->chdir($file); 
    148148    } 
    149      
     149 
    150150    function chgrp($file, $group, $recursive = false ) { 
    151151        return false; 

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

    r8550 r8600  
    436436        if( preg_match('|/([^/]+?)/?$|', $link, $matches) ) 
    437437            $slug = $matches[1];