WordPress.org

Make WordPress Core

Changeset 8600


Ignore:
Timestamp:
08/09/08 05:36:14 (6 years ago)
Author:
ryan
Message:

Trailing whitespace cleanup

Location:
trunk
Files:
89 edited

Legend:

Unmodified
Added
Removed
  • 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]; 
    438         else  
     438        else 
    439439            $slug = ''; 
    440440 
  • trunk/wp-admin/includes/file.php

    r8595 r8600  
    286286 
    287287    $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback ); 
    288      
     288 
    289289    // Strip the query strings. 
    290290    $filename = str_replace('?','-', $filename); 
    291291    $filename = str_replace('&','-', $filename); 
    292      
     292 
    293293    // Move the file to the uploads dir 
    294294    $new_file = $uploads['path'] . "/$filename"; 
     
    472472    if ( 'direct' == $type ) 
    473473        return true; 
    474          
     474 
    475475    if( ! $credentials = get_option('ftp_credentials') ) 
    476476        $credentials = array(); 
  • trunk/wp-admin/includes/image.php

    r7673 r8600  
    1818 */ 
    1919function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) { 
    20      
     20 
    2121    $thumbpath = image_resize( $file, $max_side, $max_side ); 
    2222    return apply_filters( 'wp_create_thumbnail', $thumbpath ); 
     
    9999        $sizes = array('thumbnail', 'medium'); 
    100100        $sizes = apply_filters('intermediate_image_sizes', $sizes); 
    101          
     101 
    102102        foreach ($sizes as $size) { 
    103103            $resized = image_make_intermediate_size( $file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop") ); 
     
    105105                $metadata['sizes'][$size] = $resized; 
    106106        } 
    107              
     107 
    108108        // fetch additional metadata from exif/iptc 
    109109        $image_meta = wp_read_image_metadata( $file ); 
     
    276276    else 
    277277        $result = true; 
    278          
     278 
    279279    return apply_filters('file_is_displayable_image', $result, $path); 
    280280} 
  • trunk/wp-admin/includes/media.php

    r8589 r8600  
    12891289        $alt_help = __('Also used as alternate text for the image'); 
    12901290    } 
    1291      
     1291 
    12921292    return ' 
    12931293    <table class="describe"><tbody> 
  • trunk/wp-admin/includes/misc.php

    r8540 r8600  
    165165        if( $message->get_error_data() ) 
    166166            $message = $message->get_error_message() . ': ' . $message->get_error_data(); 
    167         else  
     167        else 
    168168            $message = $message->get_error_message(); 
    169169    } 
  • trunk/wp-admin/includes/plugin-install.php

    r8550 r8600  
    99    $args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter. 
    1010    $res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API. 
    11      
     11 
    1212    if ( ! $res ) { 
    1313        $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array(), array(), array('action' => $action, 'request' => serialize($args)) ); 
     
    6868    } 
    6969    ?> 
    70      
     70 
    7171    <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> via this page.') ?></p> 
    72      
     72 
    7373    <h4><?php _e('Search') ?></h4> 
    7474    <?php install_search_form() ?> 
     
    7777        <?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br /> 
    7878        <?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p> 
    79      
     79 
    8080    <h4><?php _e('Popular tags') ?></h4> 
    8181    <p><?php _e('You may also search based on these popular tags, These are tags which are most popular on WordPress.org') ?></p> 
     
    143143function display_plugins_table($plugins, $page = 1, $totalpages = 1){ 
    144144    global $tab; 
    145      
     145 
    146146    $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : ''; 
    147147    $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; 
     
    167167                'current' => $page 
    168168            )); 
    169              
     169 
    170170            if ( $page_links ) 
    171                 echo "\t\t<div class='tablenav-pages'>$page_links</div>";    
     171                echo "\t\t<div class='tablenav-pages'>$page_links</div>"; 
    172172?> 
    173173    </div> 
     
    187187            if( empty($plugins) ) 
    188188                echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>'; 
    189              
     189 
    190190            foreach( (array) $plugins as $plugin ){ 
    191191                if ( is_object($plugin) ) 
     
    195195                $description = wp_kses($plugin['description'], $plugins_allowedtags); 
    196196                $version = wp_kses($plugin['version'], $plugins_allowedtags); 
    197                  
     197 
    198198                $name = strip_tags($title . ' ' . $version); 
    199                  
     199 
    200200                $author = $plugin['author']; 
    201201                if( ! empty($plugin['author']) ) 
     
    203203 
    204204                $author = wp_kses($author, $plugins_allowedtags); 
    205                  
     205 
    206206                if( isset($plugin['homepage']) ) 
    207207                    $title = '<a target="_blank" href="' . $plugin['homepage'] . '">' . $title . '</a>'; 
    208                  
     208 
    209209                $action_links = array(); 
    210210                $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] . 
    211211                                    '&TB_iframe=true&width=600&height=800') . '" class="thickbox onclick" title="' . 
    212212                                    attribute_escape($name) . '">' . __('Install') . '</a>'; 
    213                  
     213 
    214214                $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin); 
    215215            ?> 
     
    279279function install_plugin_information() { 
    280280    global $tab; 
    281      
     281 
    282282    $api = plugins_api('plugin_information', array('slug' => $_REQUEST['plugin'])); 
    283283 
     
    285285    if( empty($section) || ! isset($api->sections[ $section ]) ) 
    286286        $section = array_shift( $section_titles = array_keys((array)$api->sections) ); 
    287      
     287 
    288288    install_iframe_header(); 
    289289    echo "<div id='$tab-header'>\n"; 
    290290    echo "<ul id='sidemenu'>\n"; 
    291291    foreach ( (array)$api->sections as $section_name => $content ) { 
    292      
     292 
    293293        $title = $section_name; 
    294294        $title[0] = strtoupper($title[0]); //Capitalize first character. 
     
    303303    echo "</ul>\n"; 
    304304    echo "</div>\n"; 
    305      
     305 
    306306    ?> 
    307307    <div class="alignright fyi"> 
     
    350350            <li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li> 
    351351<?php endif; if ( ! empty($api->last_updated) ) : ?> 
    352             <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php  
     352            <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php 
    353353                            printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li> 
    354354<?php endif; if ( ! empty($api->requires) ) : ?> 
     
    381381            $title[0] = strtoupper($title[0]); 
    382382            $title = str_replace('_', ' ', $title); 
    383              
     383 
    384384            $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/'); 
    385385            $content = links_add_target($content, '_blank'); 
    386              
     386 
    387387            $san_title = attribute_escape(sanitize_title_with_dashes($title)); 
    388              
     388 
    389389            $display = ( $section_name == $section ) ? 'block' : 'none'; 
    390              
     390 
    391391            echo "\t<div id='section-{$san_title}' style='display: {$display};'>\n"; 
    392392            echo "\t\t<h2 class='long-header'>$title</h2>"; 
     
    407407 
    408408    install_iframe_header(); 
    409      
     409 
    410410    $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth. 
    411      
     411 
    412412    echo '<div class="wrap">'; 
    413413    echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>'; 
     
    420420function do_plugin_install($download_url = '', $plugin_information = NULL) { 
    421421    global $wp_filesystem; 
    422      
     422 
    423423    if ( empty($download_url) ) { 
    424424        show_message( __('No plugin Specified') ); 
    425425        return; 
    426426    } 
    427      
     427 
    428428    $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : ''; 
    429      
     429 
    430430    $url = 'plugin-install.php?tab=install'; 
    431431    $url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => $_REQUEST['plugin_name'], 'download_url' => $_REQUEST['download_url']), $url); 
     
    447447 
    448448    $result = wp_install_plugin( $download_url, 'show_message' ); 
    449      
     449 
    450450    if ( is_wp_error($result) ) { 
    451451        show_message($result); 
     
    490490    if( empty($content_dir) ) 
    491491        return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); 
    492      
     492 
    493493    $plugins_dir = trailingslashit( $plugins_dir ); 
    494494    $content_dir = trailingslashit( $content_dir ); 
     
    513513    // Unzip package to working directory 
    514514    $result = unzip_file($download_file, $working_dir); 
    515      
     515 
    516516    // Once extracted, delete the package 
    517517    unlink($download_file); 
    518      
     518 
    519519    if ( is_wp_error($result) ) { 
    520520        $wp_filesystem->delete($working_dir, true); 
    521521        return $result; 
    522522    } 
    523      
     523 
    524524    //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin 
    525525    $filelist = array_keys( $wp_filesystem->dirlist($working_dir) ); 
    526      
     526 
    527527    if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) { 
    528528        $wp_filesystem->delete($working_dir, true); 
    529529        return new WP_Error('install_folder_exists', __('Folder allready exists.'), $filelist[0] ); 
    530530    } 
    531      
     531 
    532532    apply_filters('install_feedback', __('Installing the plugin')); 
    533533    // Copy new version of plugin into place. 
     
    543543    // Remove working directory 
    544544    $wp_filesystem->delete($working_dir, true); 
    545      
     545 
    546546    if( empty($filelist) ) 
    547547        return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. 
    548      
     548 
    549549    $folder = $filelist[0]; 
    550550    $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash 
  • trunk/wp-admin/includes/plugin.php

    r8587 r8600  
    9191 
    9292    return array( 
    93                 'Name' => $name, 'PluginURI' => $uri, 'Description' => $description,  
    94                 'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version,  
     93                'Name' => $name, 'PluginURI' => $uri, 'Description' => $description, 
     94                'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version, 
    9595                'TextDomain' => $text_domain, 'DomainPath' => $domain_path 
    9696                ); 
     
    9898 
    9999function get_plugins($plugin_folder = '') { 
    100      
     100 
    101101    if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') ) 
    102102        $cache_plugins = array(); 
    103      
     103 
    104104    if ( isset($cache_plugins[ $plugin_folder ]) ) 
    105105        return $cache_plugins[ $plugin_folder ]; 
    106      
     106 
    107107    $wp_plugins = array (); 
    108108    $plugin_root = WP_PLUGIN_DIR; 
     
    152152    uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' )); 
    153153 
    154     $cache_plugins[ $plugin_folder ] = $wp_plugins;  
    155     wp_cache_set('plugins', $cache_plugins, 'plugins');  
     154    $cache_plugins[ $plugin_folder ] = $wp_plugins; 
     155    wp_cache_set('plugins', $cache_plugins, 'plugins'); 
    156156 
    157157    return $wp_plugins; 
     
    280280    if ( empty($plugins_dir) ) 
    281281        return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.')); 
    282      
     282 
    283283    $plugins_dir = trailingslashit( $plugins_dir ); 
    284284 
     
    296296        else 
    297297            $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file); 
    298      
     298 
    299299        if ( ! $deleted ) 
    300300            $errors[] = $plugin_file; 
    301301    } 
    302      
     302 
    303303    if( ! empty($errors) ) 
    304304        return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) ); 
    305      
     305 
    306306    return true; 
    307307} 
     
    318318 
    319319    //Invalid is any plugin that is deactivated due to error. 
    320     $invalid = array();  
     320    $invalid = array(); 
    321321 
    322322    // If a plugin file does not exist, remove it from the list of active 
  • trunk/wp-admin/includes/post.php

    r8589 r8600  
    6060    $previous_status = get_post_field('post_status',  $_POST['ID']); 
    6161 
    62     // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.  
     62    // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. 
    6363    // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. 
    6464    if ( 'page' == $_POST['post_type'] ) { 
     
    357357        wp_cache_delete($post_ID, 'post_meta'); 
    358358 
    359         $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta  
     359        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta 
    360360            (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)", 
    361361            $post_ID, $metakey, $metavalue) ); 
     
    421421    $meta_value = maybe_serialize( stripslashes( $meta_value )); 
    422422    $meta_id = (int) $meta_id; 
    423      
     423 
    424424    $data  = compact( 'meta_key', 'meta_value' ); 
    425425    $where = compact( 'meta_id' ); 
     
    586586        $post->post_status = 'publish'; 
    587587        $post->post_date = date('Y-m-d H:i:s'); 
    588         $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID);  
     588        $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); 
    589589    } 
    590590 
  • trunk/wp-admin/includes/schema.php

    r8553 r8600  
    155155function populate_options() { 
    156156    global $wpdb, $wp_db_version; 
    157      
     157 
    158158    $guessurl = wp_guess_url(); 
    159      
     159 
    160160    do_action('populate_options'); 
    161      
     161 
    162162    add_option('siteurl', $guessurl); 
    163163    add_option('blogname', __('My Blog')); 
     
    258258    add_option('enable_app', 0); 
    259259    add_option('enable_xmlrpc', 0); 
    260      
     260 
    261261    // Delete unused options 
    262262    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins'); 
  • trunk/wp-admin/includes/template.php

    r8589 r8600  
    5858            echo "\t" . _cat_row( $category, $level ); 
    5959 
    60         unset($categories[$i]); // Prune the working set         
     60        unset($categories[$i]); // Prune the working set 
    6161        $count++; 
    6262 
     
    192192 
    193193    $args = array(); 
    194      
     194 
    195195    if ( is_array( $selected_cats ) ) 
    196196        $args['selected_cats'] = $selected_cats; 
     
    548548    } 
    549549 
    550     /*  
     550    /* 
    551551     * arrange pages into two parts: top level pages and children_pages 
    552      * children_pages is two dimensional array, eg.  
    553      * children_pages[10][] contains all sub-pages whose parent is 10.  
     552     * children_pages is two dimensional array, eg. 
     553     * children_pages[10][] contains all sub-pages whose parent is 10. 
    554554     * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations 
    555555     * If searching, ignore hierarchy and treat everything as top level 
    556556     */ 
    557557    if ( empty($_GET['s']) )  { 
    558          
     558 
    559559        $top_level_pages = array(); 
    560560        $children_pages  = array(); 
    561          
     561 
    562562        foreach ( $pages as $page ) { 
    563              
     563 
    564564            // catch and repair bad pages 
    565565            if ( $page->post_parent == $page->ID ) { 
     
    568568                clean_page_cache( $page->ID ); 
    569569            } 
    570      
     570 
    571571            if ( 0 == $page->post_parent ) 
    572572                $top_level_pages[] = $page; 
     
    581581    $start = ($pagenum - 1) * $per_page; 
    582582    $end = $start + $per_page; 
    583      
     583 
    584584    foreach ( $pages as $page ) { 
    585585        if ( $count >= $end ) 
     
    594594            _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page ); 
    595595    } 
    596      
     596 
    597597    // if it is the last pagenum and there are orphaned pages, display them with paging as well 
    598598    if ( isset($children_pages) && $count < $end ){ 
     
    614614 */ 
    615615function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) { 
    616      
     616 
    617617    if ( ! isset( $children_pages[$parent] ) ) 
    618         return;  
    619          
     618        return; 
     619 
    620620    $start = ($pagenum - 1) * $per_page; 
    621621    $end = $start + $per_page; 
    622      
     622 
    623623    foreach ( $children_pages[$parent] as $page ) { 
    624          
     624 
    625625        if ( $count >= $end ) 
    626626            break; 
    627              
     627 
    628628        // If the page starts in a subtree, print the parents. 
    629629        if ( $count == $start && $page->post_parent > 0 ) { 
     
    646646        if ( $count >= $start ) 
    647647            echo "\t" . display_page_row( $page, $level ); 
    648              
     648 
    649649        $count++; 
    650650 
    651651        _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page ); 
    652652    } 
    653      
     653 
    654654    unset( $children_pages[$parent] ); //required in order to keep track of orphans 
    655655} 
     
    659659 
    660660    $current_user = wp_get_current_user(); 
    661      
     661 
    662662    if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) ) 
    663663        $user_object = new WP_User( (int) $user_object ); 
     
    748748 
    749749        $post_link .= get_the_title($comment->comment_post_ID) . '</a>'; 
    750              
     750 
    751751        $edit_link_start = "<a class='row-title' href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>"; 
    752752        $edit_link_end = '</a>'; 
     
    755755        $edit_link_start = $edit_link_end =''; 
    756756    } 
    757      
     757 
    758758    $author_url = get_comment_author_url(); 
    759759    if ( 'http://' == $author_url ) 
     
    789789    <?php endif; ?> 
    790790    <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=detail"><?php comment_author_IP() ?></a> 
    791     <?php endif; //current_user_can?>     
     791    <?php endif; //current_user_can?> 
    792792    </p> 
    793793    <?php if ( 'detail' == $mode ) comment_text(); ?> 
     
    11721172    global $wp_meta_boxes; 
    11731173 
    1174      
     1174 
    11751175    if  ( !isset($wp_meta_boxes) ) 
    11761176        $wp_meta_boxes = array(); 
  • trunk/wp-admin/includes/update-core.php

    r8599 r8600  
    128128        return new WP_Error('insane_distro', __('The update could not be unpacked') ); 
    129129    } 
    130      
     130 
    131131    apply_filters('update_feedback', __('Installing the latest version')); 
    132132 
  • trunk/wp-admin/includes/update.php

    r8597 r8600  
    7575    else 
    7676        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $details_url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&amp;plugin=' . $file, 'upgrade-plugin_' . $file) ); 
    77      
     77 
    7878    echo '</td></tr>'; 
    7979} 
     
    110110    if( empty($content_dir) ) 
    111111        return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); 
    112      
     112 
    113113    $plugins_dir = trailingslashit( $plugins_dir ); 
    114114    $content_dir = trailingslashit( $content_dir ); 
     
    137137    // Unzip package to working directory 
    138138    $result = unzip_file($download_file, $working_dir); 
    139      
     139 
    140140    // Once extracted, delete the package 
    141141    unlink($download_file); 
    142      
     142 
    143143    if ( is_wp_error($result) ) { 
    144144        $wp_filesystem->delete($working_dir, true); 
     
    155155    apply_filters('update_feedback', __('Removing the old version of the plugin')); 
    156156    $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); 
    157      
     157 
    158158    // If plugin is in its own directory, recursively delete the directory. 
    159159    if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder 
     
    183183    // Force refresh of plugin update information 
    184184    delete_option('update_plugins'); 
    185      
     185 
    186186    if( empty($filelist) ) 
    187187        return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup. 
    188      
     188 
    189189    $folder = $filelist[0]; 
    190190    $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash 
     
    224224    if( empty($content_dir) ) 
    225225        return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).')); 
    226      
     226 
    227227    $wp_dir = trailingslashit( $wp_dir ); 
    228228    $content_dir = trailingslashit( $content_dir ); 
  • trunk/wp-admin/includes/upgrade.php

    r8540 r8600  
    572572        } 
    573573 
    574         $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES  
     574        $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES 
    575575        (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) ); 
    576576 
     
    733733        populate_roles_250(); 
    734734    } 
    735      
     735 
    736736} 
    737737 
  • trunk/wp-admin/includes/widgets.php

    r8258 r8600  
    8585                    'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ), 
    8686                ) ) ); 
    87                  
     87 
    8888                $widget_control_template = '<textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea>'; 
    8989            } 
  • trunk/wp-admin/js/common.js

    r7384 r8600  
    2020        this.each(function() { 
    2121            var el = JQ(this), txt; 
    22              
     22 
    2323            if ( txt = el.attr('title') ) el.attr('tip', txt).removeAttr('title'); 
    2424            else return; 
  • trunk/wp-admin/js/editor.js

    r8313 r8600  
    1616 
    1717        document.getElementById(el).style.color = '#fff'; 
    18         if ( tinyMCE.activeEditor.isHidden() )  
     18        if ( tinyMCE.activeEditor.isHidden() ) 
    1919            content = document.getElementById(el).value; 
    2020        else 
     
    170170        // pee = pee.replace(new RegExp('^((?:&nbsp;)*)\\s', 'mg'), '$1&nbsp;'); 
    171171 
    172         // Fix the pre|script tags      
     172        // Fix the pre|script tags 
    173173        pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) { 
    174174            a = a.replace(/<br ?\/?>[\r\n]*/g, '\n'); 
  • trunk/wp-admin/js/media-upload.js

    r8313 r8600  
    88        if ( h.indexOf('[caption') != -1 ) 
    99            h = ed.plugins.wpeditimage._do_shcode(h); 
    10          
     10 
    1111        ed.execCommand('mceInsertContent', false, h); 
    1212    } else 
     
    4141        }); 
    4242    }; 
    43      
     43 
    4444    jQuery('a.thickbox').click(function(){ 
    4545        if ( typeof tinyMCE != 'undefined' &&  tinyMCE.activeEditor ) { 
  • trunk/wp-admin/js/revisions-js.php

    r8306 r8600  
    99        'qwertyuiop[]\\asdfghjkl;\'zxcvbnm,./QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?-=' 
    1010    ); 
    11 }    
     11} 
    1212 
    1313$j = clean_url( site_url( '/wp-includes/js/jquery/jquery.js' ) ); 
  • trunk/wp-admin/js/word-count.js

    r8035 r8600  
    99            t.block = 0; 
    1010            t.wc(co.val()); 
    11             co.keyup( function(e) {  
     11            co.keyup( function(e) { 
    1212                if ( e.keyCode == last ) return true; 
    1313                if ( 13 == e.keyCode || 8 == last || 46 == last ) t.wc(co.val()); 
     
    3434            }, 1 ); 
    3535        } 
    36     }  
     36    } 
    3737}(jQuery)); 
    3838 
  • trunk/wp-admin/js/wp-gears.js

    r8395 r8600  
    55        if ( 'undefined' == typeof google || ! google.gears ) return; 
    66 
    7         if ( 'undefined' == typeof localServer )  
     7        if ( 'undefined' == typeof localServer ) 
    88            localServer = google.gears.factory.create("beta.localserver"); 
    99 
  • trunk/wp-admin/plugins.php

    r8550 r8600  
    7575            if( ! current_user_can('delete_plugins') ) 
    7676                wp_die(__('You do not have sufficient permissions to delete plugins for this blog.')); 
    77              
     77 
    7878            check_admin_referer('bulk-manage-plugins'); 
    79              
     79 
    8080            $plugins = $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen. 
    8181            include(ABSPATH . 'wp-admin/update.php'); 
     
    8383            $title = __('Delete Plugin'); 
    8484            $parent_file = 'plugins.php'; 
    85              
     85 
    8686            if( ! isset($_REQUEST['verify-delete']) ) { 
    8787                wp_enqueue_script('jquery'); 
     
    8989                ?> 
    9090            <div class="wrap"> 
    91                 <h2><?php _e('Delete Plugin(s)'); ?></h2>        
     91                <h2><?php _e('Delete Plugin(s)'); ?></h2> 
    9292                <?php 
    9393                    $files_to_delete = $plugin_info = array(); 
     
    112112                <p> 
    113113                    <ul> 
    114                         <?php  
     114                        <?php 
    115115                        foreach( $plugin_info as $plugin ) 
    116116                            echo '<li>', sprintf(__('%s by %s'), $plugin['Name'], $plugin['Author']), '</li>'; 
     
    141141                    ?> 
    142142                    </ul> 
    143                 </div>               
     143                </div> 
    144144            </div> 
    145145                <?php 
     
    232232    if ( !empty($plugin_data['PluginURI']) && !empty($plugin_data['Name']) ) 
    233233        $plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '" title="'.__( 'Visit plugin homepage' ).'">' . $plugin_data['Name'] . '</a>'; 
    234      
     234 
    235235    if ( ! empty($plugin_data['AuthorURI']) ) 
    236236        $plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '" title="'.__( 'Visit author homepage' ).'">' . $plugin_data['Author'] . '</a>'; 
    237      
     237 
    238238    $plugin_data['Description'] = wptexturize( $plugin_data['Description'] ); 
    239239 
     
    299299        <td class='vers'>{$plugin_data['Version']}</td> 
    300300        <td class='desc'><p>{$plugin_data['Description']}</p></td> 
    301         <td class='togl action-links'>";   
     301        <td class='togl action-links'>"; 
    302302        if ( !empty($action_links) ) 
    303303            echo implode(' | ', $action_links); 
    304         echo '</td>  
     304        echo '</td> 
    305305    </tr>'; 
    306306        do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context ); 
     
    309309    </tbody> 
    310310</table> 
    311 <?php  
     311<?php 
    312312} //End print_plugins_table() 
    313313?> 
  • trunk/wp-admin/post.php

    r8484 r8600  
    4343            $location = get_permalink( $post_ID ); 
    4444        elseif ( false !== strpos($location, 'edit.php') ) 
    45             $location = add_query_arg('posted', $post_ID, $location);        
     45            $location = add_query_arg('posted', $post_ID, $location); 
    4646        elseif ( false !== strpos($location, 'wp-admin') ) 
    4747            $location = "post-new.php?posted=$post_ID"; 
  • trunk/wp-admin/press-this.php

    r8551 r8600  
    3535 
    3636            foreach( (array) $_REQUEST['photo_src'] as $key => $image) { 
    37                  
     37 
    3838                // see if files exist in content - we don't want to upload non-used selected files. 
    3939                if( strpos($_REQUEST['content'], $image) !== false ) { 
    4040                    $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]); 
    41                       
     41 
    4242                    // Replace the POSTED content <img> with correct uploaded ones. 
    4343                    // escape quote for matching 
     
    5050 
    5151        case "video": 
    52             if($_REQUEST['embed_code'])  
     52            if($_REQUEST['embed_code']) 
    5353                $content .= $_REQUEST['embed_code']."\n\n"; 
    5454            $content .= $_REQUEST['content']; 
     
    7474 
    7575// For submitted posts. 
    76 if ( 'post' == $_REQUEST['action'] ) {  
     76if ( 'post' == $_REQUEST['action'] ) { 
    7777    check_admin_referer('press-this'); $post_ID = press_it(); ?> 
    7878    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 
     
    139139 
    140140    <p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p> 
    141 <?php die;  
     141<?php die; 
    142142} 
    143143 
     
    164164 
    165165    <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p> 
    166 <?php die;  
     166<?php die; 
    167167} 
    168168 
     
    177177if($_REQUEST['ajax'] == 'photo_images') { 
    178178    function get_images_from_uri($uri) { 
    179         if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') )  
     179        if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') ) 
    180180            return "'".$uri."'"; 
    181181 
     
    187187        $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is'; 
    188188        preg_match_all($pattern, $content, $matches); 
    189          
     189 
    190190        if ( empty($matches[1]) ) return ''; 
    191191 
     
    199199                else 
    200200                    $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src); 
    201              
     201 
    202202            $sources[] = clean_url($src); 
    203203        } 
    204204        return "'" . implode("','", $sources) . "'"; 
    205     }  
     205    } 
    206206 
    207207    $url = urldecode($url); 
    208208    $url = str_replace(' ', '%20', $url); 
    209     echo 'new Array('.get_images_from_uri($url).')';  
     209    echo 'new Array('.get_images_from_uri($url).')'; 
    210210die; 
    211211} 
     
    227227 
    228228    for (i = 0; i < my_src.length; i++) { 
    229         img = new Image();  
    230         img.src = my_src[i];  
    231         img_attr = 'id="img' + i + '"';  
     229        img = new Image(); 
     230        img.src = my_src[i]; 
     231        img_attr = 'id="img' + i + '"'; 
    232232        skip = false; 
    233233        if (img.width && img.height) { 
    234             if (img.width * img.height < 2500)  
     234            if (img.width * img.height < 2500) 
    235235                skip = true; 
    236236            aspect = img.width / img.height; 
     
    304304?> 
    305305    <script type="text/javascript"> 
    306     <?php if ( user_can_richedit() ) {  
     306    <?php if ( user_can_richedit() ) { 
    307307        $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) ); 
    308308        // Add TinyMCE languages 
     
    360360    }); 
    361361    jQuery('#newtag').blur(function() { 
    362         if ( this.value == '' )  
     362        if ( this.value == '' ) 
    363363            jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' ); 
    364364    }); 
     
    412412                jQuery('body').addClass('video_split'); 
    413413                jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo attribute_escape($selection); ?>'}, function() { 
    414                     <?php  
     414                    <?php 
    415415                    $content = ''; 
    416416                    if ( preg_match("/youtube\.com\/watch/i", $url) ) { 
     
    461461 
    462462    jQuery(document).ready(function() { 
    463         jQuery('#menu li').click(function (){  
     463        jQuery('#menu li').click(function (){ 
    464464            tab_name = this.id.split('_'); 
    465465            tab_name = tab_name[0]; 
     
    519519                    </ul> 
    520520                </div> 
    521                  
     521 
    522522                <h2><?php _e('Tags') ?></h2> 
    523523                <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p> 
     
    525525            </div> 
    526526 
    527             <p class="submit">          
     527            <p class="submit"> 
    528528                <input type="submit" name="draft" value="<?php _e('Save') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/> 
    529529                <input type="submit" name="publish" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/> 
  • trunk/wp-admin/revision.php

    r8480 r8600  
    8585    ) 
    8686        break; 
    87      
     87 
    8888    $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>'; 
    8989    $h2 = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title ); 
     
    155155<?php endif; 
    156156 
    157 // use get_post_to_edit filters?  
     157// use get_post_to_edit filters? 
    158158$identical = true; 
    159159foreach ( _wp_post_revision_fields() as $field => $field_title ) : 
  • trunk/wp-admin/rtl.css

    r8592 r8600  
    1414 
    1515#update-nag { 
    16     clear: both;  
    17     margin-bottom: 1em;  
     16    clear: both; 
     17    margin-bottom: 1em; 
    1818} 
    1919 
    2020/* Clears update nag, so it doesn't hide the submenu */ 
    21 #update-nag {  
    22     clear: both;  
    23     margin-bottom: 1em;  
     21#update-nag { 
     22    clear: both; 
     23    margin-bottom: 1em; 
    2424} 
    2525 
     
    131131} 
    132132 
    133 .tablenav .delete  
     133.tablenav .delete 
    134134{ 
    135135    margin-left: 40px; 
     
    338338/* WPH - TinyMCE */ 
    339339 
    340 #media-items th.label {  
    341     width: 120px;  
    342 } 
    343 #media-items th.label .alignleft {  
    344     width: 100px;  
    345 } 
    346  
    347 #media-items th.label .alignright {  
    348     width: 16px;  
    349     height: 16px;  
    350 }  
     340#media-items th.label { 
     341    width: 120px; 
     342} 
     343#media-items th.label .alignleft { 
     344    width: 100px; 
     345} 
     346 
     347#media-items th.label .alignright { 
     348    width: 16px; 
     349    height: 16px; 
     350} 
    351351 
    352352/* LTRs some url- and code-only form fields */ 
    353 input#href, input#src, input#class_name {  
    354     direction: ltr;  
    355     text-align: left;  
    356 } 
    357  
    358 #sidemenu a {  
    359     float: right;  
     353input#href, input#src, input#class_name { 
     354    direction: ltr; 
     355    text-align: left; 
     356} 
     357 
     358#sidemenu a { 
     359    float: right; 
    360360} 
    361361 
     
    376376 
    377377#gallery-form table.widefat th { 
    378     float: left;  
     378    float: left; 
    379379    width: 74%; 
    380380    text-align: center; 
     
    399399} 
    400400 
    401 #library-form {  
    402     float: right;  
     401#library-form { 
     402    float: right; 
    403403} 
    404404 
  • trunk/wp-admin/update.php

    r8597 r8600  
    3636    } else { 
    3737        //Result is the new plugin file relative to WP_PLUGIN_DIR 
    38         show_message( __('Plugin upgraded successfully') );  
     38        show_message( __('Plugin upgraded successfully') ); 
    3939        if( $result && $was_activated ){ 
    4040            show_message(__('Attempting reactivation of the plugin')); 
     
    107107            show_message( __('Installation Failed') ); 
    108108    } else { 
    109         show_message( __('WordPress upgraded successfully') );   
     109        show_message( __('WordPress upgraded successfully') ); 
    110110    } 
    111111    echo '</div>'; 
     
    125125        check_admin_referer('activate-plugin_' . $plugin); 
    126126        if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { 
    127             wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );  
     127            wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
    128128            activate_plugin($plugin); 
    129             wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );  
     129            wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
    130130            die(); 
    131131        } 
  • trunk/wp-admin/upload.php

    r8484 r8600  
    210210 
    211211<?php 
    212   
     212 
    213213if ( 1 == count($posts) && is_singular() ) : 
    214      
     214 
    215215    $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) ); 
    216216    if ( $comments ) : 
  • trunk/wp-admin/user-edit.php

    r8462 r8600  
    4242 
    4343    } 
    44      
     44 
    4545    function update_nickname ( ) { 
    46          
     46 
    4747        var nickname = jQuery('#nickname').val(); 
    4848        var display_nickname = jQuery('#display_nickname').val(); 
    49          
     49 
    5050        if ( nickname == '' ) { 
    5151            jQuery('#display_nickname').remove(); 
    5252        } 
    5353        jQuery('#display_nickname').val(nickname).html(nickname); 
    54          
    55     } 
    56  
    57     jQuery(function($) {  
    58         $('#pass1').keyup( check_pass_strength )  
     54 
     55    } 
     56 
     57    jQuery(function($) { 
     58        $('#pass1').keyup( check_pass_strength ) 
    5959        $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')}); 
    6060    } ); 
    61      
     61 
    6262    jQuery(document).ready( function() { 
    6363        jQuery('#pass1,#pass2').attr('autocomplete','off'); 
     
    191191    </tr> 
    192192    </table> 
    193      
     193 
    194194    <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label> 
    195195</div> 
  • trunk/wp-admin/widgets.php

    r7979 r8600  
    133133        <br /> 
    134134        <form action="<?php echo clean_url( remove_query_arg( $query_args ) ); ?>" method="post"> 
    135          
     135 
    136136            <ul class="widget-control-list"> 
    137137                <li class="widget-list-control-item"> 
  • trunk/wp-admin/wp-admin.css

    r8305 r8600  
    226226    border-radius: 3px; 
    227227    cursor: pointer; 
    228     text-decoration: none;   
     228    text-decoration: none; 
    229229} 
    230230 
     
    913913} 
    914914 
    915 #profile-page .form-table input[type=text] {  
     915#profile-page .form-table input[type=text] { 
    916916    width: 300px; 
    917917} 
     
    15171517#poststuff h3, #poststuff .closed h3 { 
    15181518    cursor: pointer; 
    1519 }  
     1519} 
    15201520 
    15211521.hide-if-no-js { 
  • trunk/wp-app.php

    r8390 r8600  
    176176            $path = $_SERVER['ORIG_PATH_INFO']; 
    177177        else 
    178             $path = $_SERVER['PATH_INFO'];  
     178            $path = $_SERVER['PATH_INFO']; 
    179179 
    180180        $method = $_SERVER['REQUEST_METHOD']; 
  • trunk/wp-includes/cache.php

    r7990 r8600  
    252252     * by default. 
    253253     * 
    254      * On success the group and the id will be added to the  
     254     * On success the group and the id will be added to the 
    255255     * $non_existant_objects property in the class. 
    256256     * 
  • trunk/wp-includes/class-phpass.php

    r8082 r8600  
    5151 
    5252        $this->random_state = microtime() . (function_exists('getmypid') ? getmypid() : '') . uniqid(rand(), TRUE); 
    53      
     53 
    5454    } 
    5555 
  • trunk/wp-includes/class.wp-dependencies.php

    r7970 r8600  
    8080                else 
    8181                    continue; // We're at the top level.  Move on to the next one. 
    82             }                    
     82            } 
    8383 
    8484            $this->to_do[$handle] = true; 
  • trunk/wp-includes/classes.php

    r8572 r8600  
    430430        call_user_func_array(array(&$this, 'start_el'), $cb_args); 
    431431 
    432         $id = $element->$id_field;  
    433          
     432        $id = $element->$id_field; 
     433 
    434434        // descend only the depth is right and there are chilrens for this element 
    435         if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {  
     435        if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) { 
    436436 
    437437            foreach( $children_elements[ $id ] as $child ){ 
    438                  
     438 
    439439                if ( !isset($newlevel) ) { 
    440440                    $newlevel = true; 
     
    445445                $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output ); 
    446446            } 
    447             unset( $children_elements[ $id ] );  
     447            unset( $children_elements[ $id ] ); 
    448448        } 
    449449 
     
    491491         * need to display in hierarchical order 
    492492         * seperate elements into two buckets: top level and children elements 
    493          * children_elements is two dimensional array, eg.  
    494          * children_elements[10][] contains all sub-elements whose parent is 10.  
     493         * children_elements is two dimensional array, eg. 
     494         * children_elements[10][] contains all sub-elements whose parent is 10. 
    495495         */ 
    496496        $top_level_elements = array(); 
     
    510510 
    511511            $root = $elements[0]; 
    512              
     512 
    513513            $top_level_elements = array(); 
    514514            $children_elements  = array(); 
     
    534534                    $this->display_element( $op, $empty_array, 1, 0, $args, $output ); 
    535535         } 
    536           
     536 
    537537         return $output; 
    538538    } 
  • trunk/wp-includes/comment-template.php

    r8543 r8600  
    666666 
    667667    define('COMMENTS_TEMPLATE', true); 
    668          
     668 
    669669    $include = apply_filters('comments_template', STYLESHEETPATH . $file ); 
    670670    if ( file_exists( $include ) ) 
  • trunk/wp-includes/feed.php

    r8572 r8600  
    307307 * @subpackage Feed 
    308308 * @since 2.1.0 
    309  * @uses apply_filters()  
     309 * @uses apply_filters() 
    310310 * 
    311311 * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'. 
  • trunk/wp-includes/formatting.php

    r8589 r8600  
    845845    if ( '' == $text ) { 
    846846        $text = get_the_content(''); 
    847          
    848         $text = strip_shortcodes( $text );  
    849          
     847 
     848        $text = strip_shortcodes( $text ); 
     849 
    850850        $text = apply_filters('the_content', $text); 
    851851        $text = str_replace(']]>', ']]&gt;', $text); 
     
    14371437function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) { 
    14381438    $attrs = implode('|', (array)$attrs); 
    1439     return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i",  
     1439    return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", 
    14401440            create_function('$m', 'return _links_add_base($m, "' . $base . '");'), 
    14411441            $content); 
     
    14561456function _links_add_base($m, $base) { 
    14571457    //1 = attribute name  2 = quotation mark  3 = URL 
    1458     return $m[1] . '=' . $m[2] .  
     1458    return $m[1] . '=' . $m[2] . 
    14591459        (strpos($m[3], 'http://') === false ? 
    14601460            path_join($base, $m[3]) : 
     
    14661466 * Adds a Target attribute to all links in passed content. 
    14671467 * 
    1468  * This function by default only applies to <a> tags,  
     1468 * This function by default only applies to <a> tags, 
    14691469 * however this can be modified by the 3rd param. 
    14701470 * NOTE: Any current target attributed will be striped and replaced. 
     
    14801480function links_add_target( $content, $target = '_blank', $tags = array('a') ) { 
    14811481    $tags = implode('|', (array)$tags); 
    1482     return preg_replace_callback("!<($tags)(.+?)>!i",  
     1482    return preg_replace_callback("!<($tags)(.+?)>!i", 
    14831483            create_function('$m', 'return _links_add_target($m, "' . $target . '");'), 
    14841484            $content); 
  • trunk/wp-includes/functions.php

    r8598 r8600  
    14751475    if ( $echo ) 
    14761476        echo $nonce_field; 
    1477      
     1477 
    14781478    if ( $referer ) 
    14791479        wp_referer_field( $echo, 'previous' ); 
    1480      
     1480 
    14811481    return $nonce_field; 
    14821482} 
     
    16001600    if ( empty($upload_path) ) 
    16011601        $dir = WP_CONTENT_DIR . '/uploads'; 
    1602     else  
     1602    else 
    16031603        $dir = $upload_path; 
    16041604 
    16051605    // $dir is absolute, $path is (maybe) relative to ABSPATH 
    16061606    $dir = path_join( ABSPATH, $dir ); 
    1607      
     1607 
    16081608    if ( !$url = get_option( 'upload_url_path' ) ) { 
    16091609        if ( empty($upload_path) or ( $upload_path == $dir ) ) 
     
    16181618    } 
    16191619 
    1620     $bdir = $dir;  
     1620    $bdir = $dir; 
    16211621    $burl = $url; 
    16221622 
     
    16391639        return array( 'error' => $message ); 
    16401640    } 
    1641      
     1641 
    16421642    $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false ); 
    16431643 
     
    18861886        $trans['activate']['plugin']   = array( __( 'Your attempt to activate this plugin: &quot;%s&quot; has failed.' ), 'use_id' ); 
    18871887        $trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: &quot;%s&quot; has failed.' ), 'use_id' ); 
    1888         $trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: &quot;%s&quot; has failed.' ), 'use_id' );         
     1888        $trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: &quot;%s&quot; has failed.' ), 'use_id' ); 
    18891889 
    18901890        $trans['add']['post']          = array( __( 'Your attempt to add this post has failed.' ), false ); 
     
    25252525 */ 
    25262526function is_ssl() { 
    2527     return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;  
     2527    return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
    25282528} 
    25292529 
  • trunk/wp-includes/general-template.php

    r8572 r8600  
    374374 
    375375    $link_html = apply_filters( "get_archives_link", $link_html ); 
    376          
     376 
    377377    return $link_html; 
    378378} 
     
    11981198 
    11991199/** 
    1200  * Enqueues the default ThickBox js and css.  
     1200 * Enqueues the default ThickBox js and css. 
    12011201 * If any of the settings need to be changed, this can be done with another js file 
    12021202 * similar to media-upload.js and theme-preview.js. That file should require array('thickbox') 
    1203  * to ensure it is loaded after.  
     1203 * to ensure it is loaded after. 
    12041204 */ 
    12051205function add_thickbox() { 
  • trunk/wp-includes/http.php

    r8588 r8600  
    226226    /** 
    227227     * Uses the POST HTTP method. 
    228      *  
     228     * 
    229229     * Used for sending data that is expected to be in the body. 
    230230     * 
     
    245245 
    246246    /** 
    247      * Uses the GET HTTP method.  
     247     * Uses the GET HTTP method. 
    248248     * 
    249249     * Used for sending data that is expected to be in the body. 
     
    265265 
    266266    /** 
    267      * Uses the HEAD HTTP method.  
     267     * Uses the HEAD HTTP method. 
    268268     * 
    269269     * Used for sending data that is expected to be in the body. 
     
    345345     * 
    346346     * @param string|array $headers 
    347      * @return array Processed string headers  
     347     * @return array Processed string headers 
    348348     */ 
    349349    function processHeaders($headers) { 
     
    358358                continue; 
    359359 
    360              
     360 
    361361            if ( false === strpos($tempheader, ':') ) { 
    362362                list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3); 
     
    661661            $url = str_replace($arrURL['scheme'], 'http', $url); 
    662662 
    663         $arrContext = array('http' =>  
     663        $arrContext = array('http' => 
    664664            array( 
    665665                'method' => strtoupper($r['method']), 
     
    896896        if ( !ini_get('safe_mode') && !ini_get('open_basedir') ) 
    897897            curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true ); 
    898          
     898 
    899899        if( ! is_null($headers) ) 
    900900            curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers ); 
  • trunk/wp-includes/js/autosave.js

    r8170 r8600  
    1111    //Disable autosave after the form has been submitted 
    1212    $("#post").submit(function() { $.cancel(autosavePeriodical); }); 
    13      
    14     // Autosave when the preview button is clicked.  
     13 
     14    // Autosave when the preview button is clicked. 
    1515    $('#previewview a').click(function(e) { 
    1616        autosave(); 
     
    110110            jQuery('#previewview').html('<a target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>'); 
    111111 
    112             // Autosave when the preview button is clicked.   
     112            // Autosave when the preview button is clicked. 
    113113            jQuery('#previewview a').click(function(e) { 
    114114                autosave(); 
     
    131131                action: 'sample-permalink', 
    132132                post_id: post_id, 
    133                 new_title: jQuery('#title').val(),  
     133                new_title: jQuery('#title').val(), 
    134134                samplepermalinknonce: jQuery('#samplepermalinknonce').val() 
    135135            }, 
     
    181181 
    182182    /* Gotta do this up here so we can check the length when tinyMCE is in use */ 
    183     if ( rich ) {        
     183    if ( rich ) { 
    184184        var ed = tinyMCE.activeEditor; 
    185185        if ( 'mce_fullscreen' == ed.id ) 
     
    187187        tinyMCE.get('content').save(); 
    188188    } 
    189      
     189 
    190190    post_data["content"] = jQuery("#content").val(); 
    191191    if ( jQuery('#post_name').val() ) 
  • trunk/wp-includes/js/tinymce/tiny_mce_config.php

    r8517 r8600  
    1 <?php  
     1<?php 
    22// some code below is from: 
    33/** 
     
    6969$plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' ); 
    7070 
    71 /*  
     71/* 
    7272The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'. 
    73 It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin.  
    74 The url should be absolute and should include the js file name to be loaded. Example:  
     73It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
     74The url should be absolute and should include the js file name to be loaded. Example: 
    7575array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' ) 
    7676If the plugin uses a button, it should be added with one of the "$mce_buttons" filters. 
     
    8080$ext_plugins = "\n"; 
    8181if ( ! empty($mce_external_plugins) ) { 
    82      
     82 
    8383    /* 
    8484    The following filter loads external language files for TinyMCE plugins. 
    85     It takes an associative array 'plugin_name' => 'path', where path is the  
    86     include path to the file. The language file should follow the same format as  
    87     /tinymce/langs/wp-langs.php and should define a variable $strings that  
    88     holds all translated strings. Example:  
     85    It takes an associative array 'plugin_name' => 'path', where path is the 
     86    include path to the file. The language file should follow the same format as 
     87    /tinymce/langs/wp-langs.php and should define a variable $strings that 
     88    holds all translated strings. Example: 
    8989    $strings = 'tinyMCE.addI18n("' . $mce_locale . '.mypluginname_dlg",{tab_general:"General", ... })'; 
    9090    */ 
    91     $mce_external_languages = apply_filters('mce_external_languages', array());  
    92      
     91    $mce_external_languages = apply_filters('mce_external_languages', array()); 
     92 
    9393    $loaded_langs = array(); 
    9494    $strings = ''; 
    95      
     95 
    9696    if ( ! empty($mce_external_languages) ) { 
    9797        foreach ( $mce_external_languages as $name => $path ) { 
    98             if ( is_file($path) && is_readable($path) ) {  
     98            if ( is_file($path) && is_readable($path) ) { 
    9999                include_once($path); 
    100100                $ext_plugins .= $strings; 
     
    105105 
    106106    foreach ( $mce_external_plugins as $name => $url ) { 
    107          
     107 
    108108        if ( is_ssl() ) $url = str_replace('http://', 'https://', $url); 
    109          
     109 
    110110        $plugins[] = '-' . $name; 
    111111 
     
    127127$mce_buttons_3 = apply_filters('mce_buttons_3', array()); 
    128128$mce_buttons_3 = implode($mce_buttons_3, ','); 
    129      
     129 
    130130$mce_buttons_4 = apply_filters('mce_buttons_4', array()); 
    131131$mce_buttons_4 = implode($mce_buttons_4, ','); 
     
    196196 
    197197// Cache path, this is where the .gz files will be stored 
    198 $cache_path = WP_CONTENT_DIR . '/uploads/js_cache';  
     198$cache_path = WP_CONTENT_DIR . '/uploads/js_cache'; 
    199199if ( $disk_cache && ! is_dir($cache_path) ) 
    200200    $disk_cache = wp_mkdir_p($cache_path); 
     
    204204$theme = ( 'simple' == $initArray['theme'] ) ? 'simple' : 'advanced'; 
    205205$language = ( isset($initArray['language']) && ! empty($initArray['language']) ) ? substr( $initArray['language'], 0, 2 ) : 'en'; 
    206 $cacheKey = $mce_options = '';   
     206$cacheKey = $mce_options = ''; 
    207207 
    208208// Check if browser supports gzip 
     
    225225            $cacheKey .= $n; 
    226226    } 
    227      
     227 
    228228    $cacheKey = md5( $cacheKey ); 
    229229    $cache_file = $cache_path . '/tinymce_' . $cacheKey . $cache_ext; 
     
    239239 
    240240    $mtime = gmdate("D, d M Y H:i:s", filemtime($cache_file)) . " GMT"; 
    241      
     241 
    242242    if ( isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $mtime ) { 
    243243        header('HTTP/1.1 304 Not Modified'); 
     
    248248 
    249249    $content = getFileContents( $cache_file ); 
    250      
     250 
    251251    if ( '.gz' == $cache_ext ) 
    252252        header( 'Content-Encoding: gzip' ); 
     
    256256} 
    257257 
    258 foreach ( $initArray as $k => $v )  
     258foreach ( $initArray as $k => $v ) 
    259259    $mce_options .= $k . ':"' . $v . '",'; 
    260260 
     
    278278 
    279279// Add plugins 
    280 foreach ( $plugins as $plugin )  
     280foreach ( $plugins as $plugin ) 
    281281    $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin.js' ); 
    282282 
    283 // Add external plugins  
     283// Add external plugins 
    284284$content .= $ext_plugins; 
    285285 
  • trunk/wp-includes/js/tinymce/wp-mce-help.php

    r8512 r8600  
    88<title><?php _e('Rich Editor Help') ?></title> 
    99<script type="text/javascript" src="tiny_mce_popup.js?ver=311b"></script> 
    10 <?php  
     10<?php 
    1111wp_admin_css( 'global', true ); 
    1212wp_admin_css( 'wp-admin', true ); 
     
    205205        </script> 
    206206    </table> 
    207      
     207 
    208208    <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.') ?></p> 
    209209    <table class="keys" width="100%" style="border: 0 none;"> 
  • trunk/wp-includes/l10n.php

    r8556 r8600  
    292292function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) { 
    293293    $locale = get_locale(); 
    294      
     294 
    295295    if ( false !== $plugin_rel_path ) 
    296296        $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/'); 
  • trunk/wp-includes/link-template.php

    r8502 r8600  
    8686            if ( empty($category) ) { 
    8787                $default_category = get_category( get_option( 'default_category' ) ); 
    88                 $category = is_wp_error( $default_category ) ? '' : $default_category->slug;  
     88                $category = is_wp_error( $default_category ) ? '' : $default_category->slug; 
    8989            } 
    9090        } 
     
    479479        break; 
    480480    endswitch; 
    481      
     481 
    482482    return apply_filters( 'get_edit_post_link', admin_url("$file.php?{$action}$var=$post->ID"), $post->ID, $context ); 
    483483} 
     
    781781 * @since 2.6 
    782782 * 
    783  * Returns the 'site_url' option with the appropriate protocol,  'https' if is_ssl() and 'http' otherwise.  
     783 * Returns the 'site_url' option with the appropriate protocol,  'https' if is_ssl() and 'http' otherwise. 
    784784 * If $scheme is 'http' or 'https', is_ssl() is overridden. 
    785785 * 
  • trunk/wp-includes/media.php

    r8358 r8600  
    306306    if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) ) 
    307307        return false; 
    308          
     308 
    309309    $data = $imagedata['sizes'][$size]; 
    310310    // include the full filesystem path of the intermediate file 
     
    320320// returns an array (url, width, height), or false if no image is available 
    321321function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) { 
    322      
     322 
    323323    // get a thumbnail or intermediate image if there is one 
    324324    if ( $image = image_downsize($attachment_id, $size) ) 
     
    347347        $html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" alt="" />'; 
    348348    } 
    349      
     349 
    350350    return $html; 
    351351} 
     
    367367        'caption' => '' 
    368368    ), $attr)); 
    369      
     369 
    370370    if ( 1 > (int) $width || empty($caption) ) 
    371371        return $content; 
    372      
     372 
    373373    if ( $id ) $id = 'id="' . $id . '" '; 
    374      
     374 
    375375    return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">' 
    376376    . $content . '<p class="wp-caption-text">' . $caption . '</p></div>'; 
     
    423423    $columns = intval($columns); 
    424424    $itemwidth = $columns > 0 ? floor(100/$columns) : 100; 
    425      
     425 
    426426    $output = apply_filters('gallery_style', " 
    427427        <style type='text/css'> 
  • trunk/wp-includes/pluggable.php

    r8581 r8600  
    668668        } else { 
    669669            wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); 
    670             exit();          
     670            exit(); 
    671671        } 
    672672    } 
     
    757757    $location = apply_filters('wp_redirect', $location, $status); 
    758758    $status = apply_filters('wp_redirect_status', $status, $location); 
    759      
     759 
    760760    if ( !$location ) // allows the wp_redirect filter to cancel a redirect 
    761761        return false; 
     
    830830    // In php 5 parse_url may fail if the URL query part contains http://, bug #38143 
    831831    $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location; 
    832      
     832 
    833833    $lp  = parse_url($test); 
    834834    $wpp = parse_url(get_option('home')); 
     
    975975    $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n"; 
    976976 
    977     $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:',  
     977    $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:', 
    978978        'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n"; 
    979979    $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n"; 
     
    15411541    $left_string  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $left_string ); 
    15421542    $right_string = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $right_string ); 
    1543      
     1543 
    15441544    $left_lines  = split("\n", $left_string); 
    15451545    $right_lines = split("\n", $right_string); 
  • trunk/wp-includes/post-template.php

    r8572 r8600  
    8787 
    8888    if ( NULL == $more_link_text ) 
    89         $more_link_text = __( '(more...)' );  
     89        $more_link_text = __( '(more...)' ); 
    9090 
    9191    $output = ''; 
     
    451451    if ( !$post = & get_post($id) ) 
    452452        return false; 
    453          
     453 
    454454    if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) ) 
    455455        return false; 
  • trunk/wp-includes/post.php

    r8572 r8600  
    922922 
    923923    array_splice($stickies, $offset, 1); 
    924      
     924 
    925925    update_option('sticky_posts', $stickies); 
    926926} 
     
    14461446                return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error); 
    14471447            else 
    1448                 return 0;    
     1448                return 0; 
    14491449        } 
    14501450        $post_ID = (int) $wpdb->insert_id; 
     
    21492149    if ( ! empty( $meta_key ) || ! empty( $meta_value ) ) { 
    21502150        $join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )"; 
    2151          
    2152         // meta_key and met_value might be slashed  
     2151 
     2152        // meta_key and met_value might be slashed 
    21532153        $meta_key = stripslashes($meta_key); 
    21542154        $meta_value = stripslashes($meta_value); 
     
    23432343    if ( $file ) 
    23442344        update_attached_file( $post_ID, $file ); 
    2345          
     2345 
    23462346    clean_post_cache($post_ID); 
    23472347 
     
    25352535    if ( !$url = wp_get_attachment_url( $post->ID ) ) 
    25362536        return false; 
    2537          
     2537 
    25382538    $sized = image_downsize( $post_id, 'thumbnail' ); 
    25392539    if ( $sized ) 
  • trunk/wp-includes/query.php

    r8589 r8600  
    122122function is_tax( $slug = '' ) { 
    123123    global $wp_query; 
    124      
     124 
    125125    if ( !$wp_query->is_tax ) 
    126126        return false; 
     
    13591359        if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) ) 
    13601360            $join .= " LEFT JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) "; 
    1361         if ( ! empty($q['meta_key']) )  
     1361        if ( ! empty($q['meta_key']) ) 
    13621362            $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']); 
    13631363        if ( ! empty($q['meta_value']) ) 
  • trunk/wp-includes/rewrite.php

    r8572 r8600  
    6565  * @param string $base the taxonomy base that we're going to filter 
    6666  * @return string 
    67   * @author Mark Jaquith  
     67  * @author Mark Jaquith 
    6868  */ 
    6969function _wp_filter_taxonomy_base( $base ) { 
  • trunk/wp-includes/script-loader.php

    r8540 r8600  
    194194            'count' => __('Word count: %d') 
    195195        )); 
    196          
     196 
    197197        $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080721' ); 
    198198        $scripts->localize( 'wp-gears', 'wpGearsL10n', array( 
     
    200200            'error' => __('Error:') 
    201201        )); 
    202          
     202 
    203203        $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' ); 
    204204 
     
    207207            'plugin_information' => __('Plugin Information:') 
    208208        ) ); 
    209           
     209 
    210210    } 
    211211} 
  • trunk/wp-includes/shortcodes.php

    r8196 r8600  
    4949 * plugin has a similar shortcode, it will override yours or yours will override 
    5050 * theirs depending on which order the plugins are included and/or ran. 
    51  *  
     51 * 
    5252 * Simplest example of a shortcode tag using the API: 
    5353 * 
     
    205205 * @since 2.5 
    206206 * 
    207  * @param string $text  
     207 * @param string $text 
    208208 * @return array List of attributes and their value. 
    209209 */ 
     
    279279} 
    280280 
    281 add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()  
     281add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop() 
    282282 
    283283?> 
  • trunk/wp-includes/taxonomy.php

    r8572 r8600  
    785785        if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $slug, $taxonomy), ARRAY_A) ) 
    786786            return $result; 
    787              
     787 
    788788        return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A); 
    789789    } 
  • trunk/wp-includes/theme.php

    r8497 r8600  
    234234        $stylesheet_files = array(); 
    235235        $template_files = array(); 
    236          
     236 
    237237        $stylesheet_dir = @ dir("$theme_root/$stylesheet"); 
    238238        if ( $stylesheet_dir ) { 
  • trunk/wp-includes/user.php

    r8572 r8600  
    2424    if ( '' === $secure_cookie ) 
    2525        $secure_cookie = is_ssl() ? true : false; 
    26      
     26 
    2727    // If no credential info provided, check cookie. 
    2828    if ( empty($credentials['user_login']) && empty($credentials['user_password']) ) { 
     
    103103    else // Blog global 
    104104        $result = get_option( $option ); 
    105      
     105 
    106106    return apply_filters("get_user_option_{$option}", $result, $option, $user); 
    107107} 
  • trunk/wp-includes/widgets.php

    r8572 r8600  
    167167function wp_register_widget_control($id, $name, $control_callback, $options = array()) { 
    168168    global $wp_registered_widget_controls; 
    169      
     169 
    170170    $id = strtolower($id); 
    171171 
     
    463463    extract($args); 
    464464    $searchform_template = get_template_directory() . '/searchform.php'; 
    465      
     465 
    466466    echo $before_widget; 
    467      
     467 
    468468    // Use current theme search form if it exists 
    469469    if ( file_exists($searchform_template) ) { 
     
    476476        </div></form> 
    477477    <?php } 
    478      
     478 
    479479    echo $after_widget; 
    480480} 
     
    744744?> 
    745745        <ul> 
    746         <?php  
     746        <?php 
    747747            $cat_args['title_li'] = ''; 
    748             wp_list_categories($cat_args);  
     748            wp_list_categories($cat_args); 
    749749        ?> 
    750750        </ul> 
  • trunk/wp-includes/wp-db.php

    r8572 r8600  
    340340                    $collation_query .= " COLLATE '{$this->collate}'"; 
    341341            } 
    342              
     342 
    343343            if ( !empty($collation_query) ) 
    344344                $this->query($collation_query); 
    345              
    346         } 
    347          
     345 
     346        } 
     347 
    348348        $this->select($dbname); 
    349349    } 
     
    686686        else 
    687687            return false; 
    688              
     688 
    689689        return $this->query( "UPDATE $table SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ) ); 
    690690    } 
  • trunk/wp-login.php

    r8489 r8600  
    1919    } else { 
    2020        wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']); 
    21         exit();          
     21        exit(); 
    2222    } 
    2323} 
     
    136136    else if ( is_wp_error($allow) ) 
    137137        return $allow; 
    138          
     138 
    139139    $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login)); 
    140140    if ( empty($key) ) { 
  • trunk/wp-settings.php

    r8595 r8600  
    436436if ( !defined( 'AUTOSAVE_INTERVAL' ) ) 
    437437    define( 'AUTOSAVE_INTERVAL', 60 ); 
    438      
     438 
    439439 
    440440require (ABSPATH . WPINC . '/vars.php'); 
  • trunk/xmlrpc.php

    r8543 r8600  
    10141014        // We've got all the data -- post it: 
    10151015        $comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url'); 
    1016          
     1016 
    10171017        $result = wp_update_comment($comment); 
    10181018        if ( is_wp_error( $result ) ) 
     
    10931093 
    10941094        do_action('xmlrpc_call', 'wp.newComment'); 
    1095          
     1095 
    10961096        return wp_new_comment($comment); 
    10971097    } 
     
    18821882        } 
    18831883 
    1884         // Handle enclosures  
    1885         $enclosure = $content_struct['enclosure'];  
    1886         if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {  
     1884        // Handle enclosures 
     1885        $enclosure = $content_struct['enclosure']; 
     1886        if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) { 
    18871887            add_post_meta( $post_ID, 'enclosure', $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] ); 
    1888         }  
     1888        } 
    18891889 
    18901890        $this->attach_uploads( $post_ID, $post_content ); 
     
    21502150        } 
    21512151 
    2152         // Handle enclosures  
    2153         $enclosure = $content_struct['enclosure'];  
    2154         if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {  
     2152        // Handle enclosures 
     2153        $enclosure = $content_struct['enclosure']; 
     2154        if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) { 
    21552155            add_post_meta( $post_ID, 'enclosure', $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] ); 
    2156         }  
     2156        } 
    21572157 
    21582158        $this->attach_uploads( $ID, $post_content ); 
Note: See TracChangeset for help on using the changeset viewer.