WordPress.org

Make WordPress Core

Changeset 11450


Ignore:
Timestamp:
05/24/09 23:47:49 (6 years ago)
Author:
ryan
Message:

Trim tailing whitespace

Location:
trunk
Files:
54 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-ajax.php

    r11427 r11450  
    10651065 
    10661066    $data = &$_POST; 
    1067      
     1067 
    10681068    $post = get_post( $post_ID, ARRAY_A ); 
    10691069    $post = add_magic_quotes($post); //since it is from db 
    1070      
     1070 
    10711071    $data['content'] = $post['post_content']; 
    10721072    $data['excerpt'] = $post['post_excerpt']; 
     
    13241324        die(); 
    13251325    } 
    1326      
     1326 
    13271327    die('1'); 
    13281328    break; 
  • trunk/wp-admin/cache-manifest.php

    r11449 r11450  
    2525header( 'Cache-Control: no-cache, must-revalidate, max-age=0' ); 
    2626header( 'Pragma: no-cache' ); 
    27 header( 'Content-Type: text/cache-manifest; charset=UTF-8' );  
     27header( 'Content-Type: text/cache-manifest; charset=UTF-8' ); 
    2828?> 
    2929CACHE MANIFEST 
  • trunk/wp-admin/css/widgets.css

    r11445 r11450  
    194194} 
    195195 
    196 .widget-inside,  
     196.widget-inside, 
    197197.widget-description { 
    198198    display: none; 
  • trunk/wp-admin/import/dotclear.php

    r11278 r11450  
    5151/** 
    5252 * Convert from dotclear charset to utf8 if required 
    53  *  
     53 * 
    5454 * @package WordPress 
    5555 * @subpackage Dotclear_Import 
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r11383 r11450  
    3535            $this->skin = $skin; 
    3636    } 
    37      
     37 
    3838    function init() { 
    3939        $this->skin->set_upgrader($this); 
     
    522522 
    523523    function install($package) { 
    524          
     524 
    525525        $this->init(); 
    526526        $this->install_strings(); 
     
    787787 
    788788/** 
    789  * Plugin Upgrader Skin for WordPress Plugin Upgrades.  
     789 * Plugin Upgrader Skin for WordPress Plugin Upgrades. 
    790790 * 
    791791 * @TODO More Detailed docs, for methods as well. 
     
    836836 
    837837/** 
    838  * Plugin Installer Skin for WordPress Plugin Installer.  
     838 * Plugin Installer Skin for WordPress Plugin Installer. 
    839839 * 
    840840 * @TODO More Detailed docs, for methods as well. 
     
    891891 
    892892/** 
    893  * Theme Installer Skin for the WordPress Theme Installer.  
     893 * Theme Installer Skin for the WordPress Theme Installer. 
    894894 * 
    895895 * @TODO More Detailed docs, for methods as well. 
     
    956956 
    957957/** 
    958  * Theme Upgrader Skin for WordPress Theme Upgrades.  
     958 * Theme Upgrader Skin for WordPress Theme Upgrades. 
    959959 * 
    960960 * @TODO More Detailed docs, for methods as well. 
  • trunk/wp-admin/includes/dashboard.php

    r11383 r11450  
    318318    echo "\n\t".'<div class="versions">'; 
    319319    $ct = current_theme_info(); 
    320      
     320 
    321321    echo "\n\t<p>"; 
    322322    if ( !empty($wp_registered_sidebars) ) { 
  • trunk/wp-admin/includes/file.php

    r11312 r11450  
    7272            $wp_path_rel_to_home = str_replace($home, '', $siteurl); /* $siteurl - $home */ 
    7373            $pos = strpos($_SERVER["SCRIPT_FILENAME"], $wp_path_rel_to_home); 
    74             $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos);         
     74            $home_path = substr($_SERVER["SCRIPT_FILENAME"], 0, $pos); 
    7575        $home_path = trailingslashit( $home_path ); 
    7676    } else { 
     
    688688        $credentials['connection_type'] = 'ftp'; 
    689689 
    690     if ( ! $error &&  
     690    if ( ! $error && 
    691691            ( 
    692692                ( !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) || 
  • trunk/wp-admin/includes/media.php

    r11383 r11450  
    195195    if ( isset($file['error']) ) 
    196196        return new WP_Error( 'upload_error', $file['error'] ); 
    197          
     197 
    198198    $name_parts = pathinfo($name); 
    199199    $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) ); 
     
    328328    $args = array_slice($args, 1); 
    329329    call_user_func_array($content_func, $args); 
    330      
     330 
    331331    do_action('admin_print_footer_scripts'); 
    332332?> 
  • trunk/wp-admin/includes/misc.php

    r11350 r11450  
    139139 * Updates the IIS web.config file with the current rules if it is writable. 
    140140 * If the permalinks do not require rewrite rules then the rules are deleted from the web.config file. 
    141  *  
     141 * 
    142142 * @since 2.8.0 
    143  *  
     143 * 
    144144 * @return bool True if web.config was updated successfully 
    145145 */ 
    146146function iis7_save_url_rewrite_rules(){ 
    147147    global $wp_rewrite; 
    148      
     148 
    149149    $home_path = get_home_path(); 
    150150    $web_config_file = $home_path . 'web.config'; 
    151151 
    152     // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP  
     152    // Using win_is_writable() instead of is_writable() because of a bug in Windows PHP 
    153153    if ( ( ! file_exists($web_config_file) && win_is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks() ) || win_is_writable($web_config_file) ) { 
    154154        if ( iis7_supports_permalinks() ) { 
     
    402402/** 
    403403 * Check if IIS 7 supports pretty permalinks 
    404  *  
     404 * 
    405405 * @since 2.8.0 
    406  *  
     406 * 
    407407 * @return bool 
    408408 */ 
     
    410410    global $is_iis7; 
    411411 
    412     $supports_permalinks = false;    
     412    $supports_permalinks = false; 
    413413    if ( $is_iis7 ) { 
    414414        /* First we check if the DOMDocument class exists. If it does not exist, 
     
    419419         * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When 
    420420         * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'. 
    421          * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs  
     421         * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs 
    422422         * via ISAPI then pretty permalinks will not work. 
    423423         */ 
    424424        $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' ); 
    425425    } 
    426          
     426 
    427427    return apply_filters('iis7_supports_permalinks', $supports_permalinks); 
    428428} 
     
    430430/** 
    431431 * Check if rewrite rule for WordPress already exists in the IIS 7 configuration file 
    432  *  
     432 * 
    433433 * @since 2.8.0 
    434  *  
     434 * 
    435435 * @return bool 
    436436 * @param string $filename The file path to the configuration file 
    437437 */ 
    438 function iis7_rewrite_rule_exists($filename) {   
     438function iis7_rewrite_rule_exists($filename) { 
    439439    if ( ! file_exists($filename) ) 
    440         return false;    
     440        return false; 
    441441    if ( ! class_exists('DOMDocument') ) 
    442442        return false; 
    443      
     443 
    444444    $doc = new DOMDocument(); 
    445445    if ( $doc->load($filename) === false ) 
     
    450450        return false; 
    451451    else 
    452         return true;     
     452        return true; 
    453453} 
    454454 
     
    456456 * Delete WordPress rewrite rule from web.config file if it exists there 
    457457 * 
    458  * @since 2.8.0  
     458 * @since 2.8.0 
    459459 * 
    460460 * @param string $filename Name of the configuration file 
    461461 * @return bool 
    462462 */ 
    463 function iis7_delete_rewrite_rule($filename) {   
     463function iis7_delete_rewrite_rule($filename) { 
    464464    // If configuration file does not exist then rules also do not exist so there is nothing to delete 
    465465    if ( ! file_exists($filename) ) 
    466466        return true; 
    467      
     467 
    468468    if ( ! class_exists('DOMDocument') ) 
    469469        return false; 
    470      
     470 
    471471    $doc = new DOMDocument(); 
    472472    $doc->preserveWhiteSpace = false; 
     
    488488/** 
    489489 * Add WordPress rewrite rule to the IIS 7 configuration file. 
    490  *  
     490 * 
    491491 * @since 2.8.0 
    492  *  
     492 * 
    493493 * @param string $filename The file path to the configuration file 
    494494 * @param string $rewrite_rule The XML fragment with URL Rewrite rule 
    495495 * @return bool 
    496496 */ 
    497 function iis7_add_rewrite_rule($filename, $rewrite_rule) {   
     497function iis7_add_rewrite_rule($filename, $rewrite_rule) { 
    498498    if ( ! class_exists('DOMDocument') ) 
    499499        return false; 
    500      
     500 
    501501    // If configuration file does not exist then we create one. 
    502502    if ( ! file_exists($filename) ) { 
     
    505505        fclose($fp); 
    506506    } 
    507      
     507 
    508508    $doc = new DOMDocument(); 
    509509    $doc->preserveWhiteSpace = false; 
     
    511511    if ( $doc->load($filename) === false ) 
    512512        return false; 
    513      
     513 
    514514    $xpath = new DOMXPath($doc); 
    515515 
     
    525525    } else { 
    526526        $rules_node = $doc->createElement('rules'); 
    527          
     527 
    528528        $xmlnodes = $xpath->query('/configuration/system.webServer/rewrite'); 
    529529        if ( $xmlnodes->length > 0 ) { 
     
    541541                $system_webServer_node = $doc->createElement('system.webServer'); 
    542542                $system_webServer_node->appendChild($rewrite_node); 
    543          
     543 
    544544                $xmlnodes = $xpath->query('/configuration'); 
    545545                if ( $xmlnodes->length > 0 ) { 
     
    554554        } 
    555555    } 
    556      
     556 
    557557    $rule_fragment = $doc->createDocumentFragment(); 
    558558    $rule_fragment->appendXML($rewrite_rule); 
    559559    $rules_node->appendChild($rule_fragment); 
    560560 
    561     $doc->formatOutput = true;   
     561    $doc->formatOutput = true; 
    562562    saveDomDocument($doc, $filename); 
    563563 
    564     return true;     
     564    return true; 
    565565} 
    566566 
    567567/** 
    568568 * Saves the XML document into a file 
    569  *  
     569 * 
    570570 * @since 2.8.0 
    571571 * 
  • trunk/wp-admin/includes/plugin.php

    r11207 r11450  
    469469 
    470470    // Force refresh of plugin update information 
    471     if ( $current = get_transient('update_plugins') ) {  
     471    if ( $current = get_transient('update_plugins') ) { 
    472472        unset( $current->response[ $plugin_file ] ); 
    473473        set_transient('update_plugins', $current); 
     
    599599        $icon_url = 'images/generic.png'; 
    600600    elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) 
    601         $icon_url = 'https://' . substr($icon_url, 7);  
     601        $icon_url = 'https://' . substr($icon_url, 7); 
    602602 
    603603    $menu[] = array ( $menu_title, $access_level, $file, $page_title, 'menu-top ' . $hookname, $hookname, $icon_url ); 
     
    641641        $icon_url = 'images/generic.png'; 
    642642    elseif ( is_ssl() && 0 === strpos($icon_url, 'http://') ) 
    643         $icon_url = 'https://' . substr($icon_url, 7);  
     643        $icon_url = 'https://' . substr($icon_url, 7); 
    644644 
    645645    $_wp_last_utility_menu++; 
  • trunk/wp-admin/includes/post.php

    r11437 r11450  
    928928    } 
    929929 
    930     $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);   
     930    $post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent); 
    931931 
    932932    // If the user wants to set a new name -- override the current one 
     
    13401340    $language = $initArray['language']; 
    13411341    $zip = $compress_scripts ? 1 : 0; 
    1342      
     1342 
    13431343    /** 
    13441344     * Deprecated 
    1345      *   
     1345     * 
    13461346     * The tiny_mce_version filter is not needed since external plugins are loaded directly by TinyMCE. 
    13471347     * These plugins can be refreshed by appending query string to the URL passed to mce_external_plugins filter. 
    1348      * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code).   
     1348     * If the plugin has a popup dialog, a query string can be added to the button action that opens it (in the plugin's code). 
    13491349     */ 
    13501350    $version = apply_filters('tiny_mce_version', ''); 
  • trunk/wp-admin/includes/schema.php

    r11318 r11450  
    304304    'widget_text' => array(), 
    305305    'widget_rss' => array(), 
    306      
     306 
    307307    // 2.8 
    308308    'timezone_string' => '' 
  • trunk/wp-admin/includes/template.php

    r11445 r11450  
    2222 */ 
    2323function cat_rows( $parent = 0, $level = 0, $categories = 0, $page = 1, $per_page = 20 ) { 
    24      
     24 
    2525    $count = 0; 
    26      
     26 
    2727    if ( empty($categories) ) { 
    28          
     28 
    2929        $args = array('hide_empty' => 0); 
    3030        if ( !empty($_GET['s']) ) 
    3131            $args['search'] = $_GET['s']; 
    32              
    33         $categories = get_categories( $args );  
    34          
     32 
     33        $categories = get_categories( $args ); 
     34 
    3535        if ( empty($categories) ) 
    3636            return false; 
    3737    } 
    3838 
    39     $children = _get_term_hierarchy('category');  
    40      
    41     _cat_rows( $parent, $level, $categories, $children, $page, $per_page, $count );  
    42      
     39    $children = _get_term_hierarchy('category'); 
     40 
     41    _cat_rows( $parent, $level, $categories, $children, $page, $per_page, $count ); 
     42 
    4343} 
    4444 
     
    5656 * @return unknown 
    5757 */ 
    58 function _cat_rows( $parent = 0, $level = 0, $categories, &$children, $page = 1, $per_page = 20, &$count ) {  
    59      
     58function _cat_rows( $parent = 0, $level = 0, $categories, &$children, $page = 1, $per_page = 20, &$count ) { 
     59 
    6060    $start = ($page - 1) * $per_page; 
    6161    $end = $start + $per_page; 
    6262    ob_start(); 
    63      
     63 
    6464    foreach ( $categories as $key => $category ) { 
    6565        if ( $count >= $end ) 
    6666            break; 
    67              
     67 
    6868        if ( $category->parent != $parent && empty($_GET['s']) ) 
    6969            continue; 
     
    7171        // If the page starts in a subtree, print the parents. 
    7272        if ( $count == $start && $category->parent > 0 ) { 
    73              
     73 
    7474            $my_parents = array(); 
    7575            $p = $category->parent; 
     
    8181                $p = $my_parent->parent; 
    8282            } 
    83              
     83 
    8484            $num_parents = count($my_parents); 
    8585            while( $my_parent = array_pop($my_parents) ) { 
     
    9292            echo "\t" . _cat_row( $category, $level ); 
    9393 
    94         unset( $categories[ $key ] );  
    95          
     94        unset( $categories[ $key ] ); 
     95 
    9696        $count++; 
    9797 
    9898        if ( isset($children[$category->term_id]) ) 
    99             _cat_rows( $category->term_id, $level + 1, $categories, $children, $page, $per_page, $count );  
     99            _cat_rows( $category->term_id, $level + 1, $categories, $children, $page, $per_page, $count ); 
    100100    } 
    101101 
     
    518518    // Post process $categories rather than adding an exclude to the get_terms() query to keep the query the same across all posts (for any query cache) 
    519519    $checked_categories = array(); 
    520     $keys = array_keys( $categories );  
    521      
     520    $keys = array_keys( $categories ); 
     521 
    522522    foreach( $keys as $k ) { 
    523523        if ( in_array( $categories[$k]->term_id, $args['selected_cats'] ) ) { 
    524524            $checked_categories[] = $categories[$k]; 
    525525            unset( $categories[$k] ); 
    526         }    
     526        } 
    527527    } 
    528528 
     
    35993599        return ''; 
    36003600    } 
    3601      
     3601 
    36023602    $screen_layout_columns = get_user_option("screen_layout_$screen"); 
    36033603    $num = $columns[$screen]; 
  • trunk/wp-admin/includes/update.php

    r11391 r11450  
    155155    $plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array()); 
    156156    $plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags ); 
    157          
     157 
    158158    $details_url = admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&TB_iframe=true&width=600&height=800'); 
    159159 
     
    165165    else 
    166166        printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s Details</a> or <a href="%5$s">upgrade automatically</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&plugin=' . $file, 'upgrade-plugin_' . $file) ); 
    167      
     167 
    168168    do_action( "in_plugin_update_message-$file", $plugin_data, $r ); 
    169      
     169 
    170170    echo '</div></td></tr>'; 
    171171} 
  • trunk/wp-admin/includes/user.php

    r11441 r11450  
    180180 
    181181    // Allow plugins to return there own errors. 
    182     do_action_ref_array('user_profile_update_errors', array ( &$errors, $update, &$user ) );     
    183      
     182    do_action_ref_array('user_profile_update_errors', array ( &$errors, $update, &$user ) ); 
     183 
    184184    if ( $errors->get_error_codes() ) 
    185185        return $errors; 
     
    804804 
    805805    //get_user_setting = JS saved UI setting. else no-js-falback code. 
    806     if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {      
     806    if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) { 
    807807        delete_user_setting('default_password_nag'); 
    808808        update_usermeta($user_ID, 'default_password_nag', false); 
  • trunk/wp-admin/js/common.dev.js

    r11437 r11450  
    138138jQuery(document).ready( function($) { 
    139139    var lastClicked = false, checks, first, last, checked; 
    140      
     140 
    141141    // pulse 
    142142    $('.fade').animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300).animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300); 
  • trunk/wp-admin/js/custom-fields.dev.js

    r10326 r11450  
    11jQuery(document).ready( function($) { 
    22    var before, addBefore, addAfter, delBefore; 
    3      
     3 
    44    before = function() { 
    55        var nonce = $('#newmeta [name=_ajax_nonce]').val(), postId = $('#post_ID').val(); 
  • trunk/wp-admin/js/edit-comments.dev.js

    r10531 r11450  
    44setCommentsList = function() { 
    55    var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter; 
    6      
     6 
    77    totalInput = $('#comments-form .tablenav :input[name="_total"]'); 
    88    perPageInput = $('#comments-form .tablenav :input[name="_per_page"]'); 
     
    102102        }); 
    103103 
    104          
     104 
    105105        // XML response 
    106106        if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) { 
     
    157157                commentReply.close(); 
    158158        }); 
    159          
     159 
    160160        this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || ''; 
    161161 
     
    251251        setTimeout(function() { 
    252252            var rtop, rbottom, scrollTop, vp, scrollBottom; 
    253              
     253 
    254254            rtop = $('#replyrow').offset().top; 
    255255            rbottom = rtop + $('#replyrow').height(); 
     
    317317        $(c).hide() 
    318318        $('#replyrow').after(c); 
    319          
     319 
    320320        this.o = id = '#comment-'+r.id; 
    321321        this.revert(); 
     
    358358            return function() { 
    359359                var first_last, l; 
    360                  
     360 
    361361                first_last = 'next' == which? 'first' : 'last'; 
    362362                l = $('.'+which+'.page-numbers'); 
  • trunk/wp-admin/js/inline-edit-post.dev.js

    r10444 r11450  
    193193    save : function(id) { 
    194194        var params, fields; 
    195          
     195 
    196196        if( typeof(id) == 'object' ) 
    197197            id = this.getId(id); 
  • trunk/wp-admin/js/inline-edit-tax.dev.js

    r10557 r11450  
    6565    save : function(id) { 
    6666        var params, fields, tax = $('input[name="taxonomy"]').val() || ''; 
    67          
     67 
    6868        if( typeof(id) == 'object' ) 
    6969            id = this.getId(id); 
  • trunk/wp-admin/js/media-upload.dev.js

    r10366 r11450  
    22function send_to_editor(h) { 
    33    var ed; 
    4      
     4 
    55    if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) { 
    66        ed.focus(); 
  • trunk/wp-admin/js/page.dev.js

    r10348 r11450  
    2323    function updateText() { 
    2424        var attemptedDate, originalDate, currentDate, publishOn; 
    25          
     25 
    2626        attemptedDate = new Date( $('#aa').val(), $('#mm').val() -1, $('#jj').val(), $('#hh').val(), $('#mn').val()); 
    2727        originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val()); 
  • trunk/wp-admin/js/post.dev.js

    r11224 r11450  
    3737    jQuery.each( current_tags, function( key, val ) { 
    3838        var txt, button_id; 
    39          
     39 
    4040        val = jQuery.trim(val); 
    4141        if ( !val.match(/^\s+$/) && '' != val ) { 
     
    5353    a = a || false; 
    5454    var taxbox, text, tags, newtags; 
    55      
     55 
    5656    taxbox = jQuery('#'+id); 
    5757    text = a ? jQuery(a).text() : taxbox.find('input.newtag').val(); 
     
    6969    taxbox.find('.the-tags').val(newtags); 
    7070    tag_update_quickclicks(taxbox); 
    71      
     71 
    7272    if ( ! a ) 
    7373        taxbox.find('input.newtag').val('').focus(); 
     
    318318    function updateText() { 
    319319        var attemptedDate, originalDate, currentDate, publishOn; 
    320          
     320 
    321321        attemptedDate = new Date( $('#aa').val(), $('#mm').val() -1, $('#jj').val(), $('#hh').val(), $('#mn').val()); 
    322322        originalDate = new Date( $('#hidden_aa').val(), $('#hidden_mm').val() -1, $('#hidden_jj').val(), $('#hidden_hh').val(), $('#hidden_mn').val()); 
  • trunk/wp-admin/js/tags.dev.js

    r10557 r11450  
    1919                options[o] = null; 
    2020    } 
    21      
     21 
    2222    delBefore = function(s) { 
    2323        s.data.taxonomy = $('input[name="taxonomy"]').val(); 
  • trunk/wp-admin/js/theme-preview.dev.js

    r10823 r11450  
    2424        var alink = $(this).parents('.available-theme').find('.activatelink'), link = '', href = $(this).attr('href'), url, text; 
    2525 
    26         if ( tbWidth = href.match(/&tbWidth=[0-9]+/) )           
     26        if ( tbWidth = href.match(/&tbWidth=[0-9]+/) ) 
    2727            tbWidth = parseInt(tbWidth[0].replace(/[^0-9]+/g, ''), 10); 
    2828        else 
    2929            tbWidth = $(window).width() - 90; 
    3030 
    31         if ( tbHeight = href.match(/&tbHeight=[0-9]+/) )         
     31        if ( tbHeight = href.match(/&tbHeight=[0-9]+/) ) 
    3232            tbHeight = parseInt(tbHeight[0].replace(/[^0-9]+/g, ''), 10); 
    3333        else 
  • trunk/wp-admin/js/utils.dev.js

    r10348 r11450  
    135135    if ( 'object' !== typeof userSettings ) 
    136136        return false; 
    137      
     137 
    138138    var c = 'wp-settings-' + userSettings.uid, o = wpCookies.getHash(c) || {}, d = new Date(), p, 
    139139    n = name.toString().replace(/[^A-Za-z0-9_]/, ''), v = value.toString().replace(/[^A-Za-z0-9_]/, ''); 
     
    150150    wpCookies.setHash(c, o, d, p); 
    151151    wpCookies.set('wp-settings-time-'+userSettings.uid, userSettings.time, d, p); 
    152      
     152 
    153153    return name; 
    154154} 
  • trunk/wp-admin/link-manager.php

    r11380 r11450  
    234234                    ?><td <?php echo $attributes ?>><?php echo $visible; ?></td><?php 
    235235                    break; 
    236                 case 'rating':  
    237                     ?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php  
    238                     break;  
     236                case 'rating': 
     237                    ?><td <?php echo $attributes ?>><?php echo $rating; ?></td><?php 
     238                    break; 
    239239                default: 
    240240                    ?> 
  • trunk/wp-admin/menu.php

    r11204 r11450  
    129129foreach ($menu as $menu_page) { 
    130130    $hook_name = sanitize_title(basename($menu_page[2], '.php')); 
    131      
     131 
    132132    // ensure we're backwards compatible 
    133133    $compat = array( 
     
    141141        'themes' => 'appearance', 
    142142        ); 
    143      
     143 
    144144    if ( isset($compat[$hook_name]) ) 
    145145        $hook_name = $compat[$hook_name]; 
    146146    elseif ( !$hook_name ) 
    147147        continue; 
    148      
     148 
    149149    $admin_page_hooks[$menu_page[2]] = $hook_name; 
    150150} 
  • trunk/wp-admin/options-permalink.php

    r11380 r11450  
    229229    <p><textarea rows="10" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules()); ?></textarea></p> 
    230230</form> 
    231 <p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.')  ?></p>   
     231<p><?php _e('If you temporarily make your <code>web.config</code> file writable for us to generate rewrite rules automatically, do not forget to revert the permissions after rule has been saved.')  ?></p> 
    232232    <?php endif; ?> 
    233 <?php else :  
     233<?php else : 
    234234    if ( $permalink_structure && ! $usingpi && ! $writable ) : ?> 
    235235<p><?php _e('If your <code>.htaccess</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p> 
  • trunk/wp-admin/plugin-editor.php

    r11380 r11450  
    8585 
    8686    wp_enqueue_script( 'codepress' ); 
    87     add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );   
    88      
     87    add_action( 'admin_print_footer_scripts', 'codepress_footer_js' ); 
     88 
    8989    // List of allowable extensions 
    9090    $editable_extensions = array('php', 'txt', 'text', 'js', 'css', 'html', 'htm', 'xml', 'inc', 'include'); 
     
    102102        } 
    103103    } 
    104      
     104 
    105105    require_once('admin-header.php'); 
    106      
     106 
    107107    update_recently_edited(WP_PLUGIN_DIR . '/' . $file); 
    108108 
  • trunk/wp-admin/plugins.php

    r11422 r11450  
    411411        echo "</p></td> 
    412412    </tr>\n"; 
    413      
     413 
    414414        do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context ); 
    415415        do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $context ); 
  • trunk/wp-admin/widgets.php

    r11445 r11450  
    7070        } 
    7171    } 
    72      
     72 
    7373    // discard invalid, theme-specific widgets from sidebars 
    7474    $shown_widgets = array(); 
     
    7676        if ( !is_array($widgets) ) 
    7777            continue; 
    78          
     78 
    7979        $_widgets = array(); 
    8080        foreach ( $widgets as $widget ) { 
     
    221221    if ( !isset($name) ) 
    222222        $name = esc_html( strip_tags($control['name']) ); 
    223      
     223 
    224224    if ( !isset($sidebar) ) 
    225225        $sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets'; 
     
    243243    <form action="widgets.php" method="post"> 
    244244    <div class="widget-inside"> 
    245 <?php    
     245<?php 
    246246    if ( is_callable( $control_callback ) ) 
    247247        call_user_func_array( $control_callback, $control['params'] ); 
  • trunk/wp-includes/author-template.php

    r11416 r11450  
    8181 
    8282/** 
    83  * Retrieve the requested data of the author of the current post.  
    84  * @link http://codex.wordpress.org/Template_Tags/the_author_meta  
    85  * @since 2.8.0  
     83 * Retrieve the requested data of the author of the current post. 
     84 * @link http://codex.wordpress.org/Template_Tags/the_author_meta 
     85 * @since 2.8.0 
    8686 * @uses $authordata The current author's DB object (if $user_id not specified). 
    87  * @param string $field selects the field of the users record.  
     87 * @param string $field selects the field of the users record. 
    8888 * @param int $user_id Optional. User ID. 
    89  * @return string The author's field from the current author's DB object.  
     89 * @return string The author's field from the current author's DB object. 
    9090 */ 
    9191function get_the_author_meta($field = '', $user_id = false) { 
     
    9797    $field = strtolower($field); 
    9898    $user_field = "user_$field"; 
    99      
     99 
    100100    if ( 'id' == $field ) 
    101101        $value = isset($authordata->ID) ? (int)$authordata->ID : 0; 
     
    109109 
    110110/** 
    111  * Retrieve the requested data of the author of the current post.  
    112  * @link http://codex.wordpress.org/Template_Tags/the_author_meta  
    113  * @since 2.8.0  
    114  * @param string $field selects the field of the users record.  
     111 * Retrieve the requested data of the author of the current post. 
     112 * @link http://codex.wordpress.org/Template_Tags/the_author_meta 
     113 * @since 2.8.0 
     114 * @param string $field selects the field of the users record. 
    115115 * @param int $user_id Optional. User ID. 
    116  * @echo string The author's field from the current author's DB object.  
     116 * @echo string The author's field from the current author's DB object. 
    117117 */ 
    118118function the_author_meta($field = '', $user_id = false) { 
  • trunk/wp-includes/category-template.php

    r11428 r11450  
    576576 * The 'tag_cloud_sort' filter allows you to override the sorting done 
    577577 * by the 'orderby' argument; passed to the filter: $tags array and $args array. 
    578  *  
     578 * 
    579579 * The 'orderby' argument will accept 'name' or 'count' and defaults to 'name'. 
    580580 * The 'order' is the direction to sort, defaults to 'ASC' and can be 'DESC' or 
     
    624624 
    625625        $tags = apply_filters( 'tag_cloud_sort', $tags, $args ); 
    626      
     626 
    627627    if ( 'DESC' == $order ) 
    628628        $tags = array_reverse( $tags, true ); 
  • trunk/wp-includes/class.wp-dependencies.php

    r11058 r11450  
    9090 
    9191            $moved = $this->set_group( $handle, $recursion, $group ); 
    92              
     92 
    9393            if ( $queued && !$moved ) // already queued and in the right group 
    9494                continue; 
  • trunk/wp-includes/comment.php

    r11410 r11450  
    170170 * 
    171171 * The comment list can be for the blog as a whole or for an individual post. 
    172  *  
     172 * 
    173173 * The list of comment arguments are 'status', 'orderby', 'comment_date_gmt', 
    174174 * 'order', 'number', 'offset', and 'post_id'. 
  • trunk/wp-includes/default-widgets.php

    r11432 r11450  
    190190        echo $after_widget; 
    191191    } 
    192      
     192 
    193193    function form( $instance ) { 
    194194        $instance = wp_parse_args( (array) $instance, array( 'title' => '') ); 
     
    198198<?php 
    199199    } 
    200      
     200 
    201201    function update( $new_instance, $old_instance ) { 
    202202        $instance = $old_instance; 
     
    204204        $instance['title'] = strip_tags($new_instance['title']); 
    205205        return $instance; 
    206     }    
    207      
     206    } 
     207 
    208208} 
    209209 
  • trunk/wp-includes/deprecated.php

    r11383 r11450  
    16731673 * @return int The author's ID. 
    16741674 */ 
    1675 function get_the_author_ID() {   
     1675function get_the_author_ID() { 
    16761676    _deprecated_function(__FUNCTION__, '2.8', 'get_the_author_meta(\'ID\')' ); 
    16771677    return get_the_author_meta('ID'); 
     
    16861686 * @uses get_the_author_ID() 
    16871687*/ 
    1688 function the_author_ID() {   
     1688function the_author_ID() { 
    16891689    _deprecated_function(__FUNCTION__, '2.8', 'the_author_meta(\'ID\')' ); 
    16901690    the_author_meta('ID'); 
    1691 }  
     1691} 
    16921692 
    16931693?> 
  • trunk/wp-includes/formatting.php

    r11435 r11450  
    173173 * Checks to see if a string is utf8 encoded. 
    174174 * 
    175  * NOTE: This function checks for 5-Byte sequences, UTF8  
     175 * NOTE: This function checks for 5-Byte sequences, UTF8 
    176176 *       has Bytes Sequences with a maximum length of 4. 
    177177 * 
     
    185185    $length = strlen($str); 
    186186    for ($i=0; $i < $length; $i++) { 
    187         $c = ord($str[$i]);  
     187        $c = ord($str[$i]); 
    188188        if ($c < 0x80) $n = 0; # 0bbbbbbb 
    189189        elseif (($c & 0xE0) == 0xC0) $n=1; # 110bbbbb 
     
    257257        $quote_style = ENT_NOQUOTES; 
    258258    } 
    259      
     259 
    260260    // Handle double encoding ourselves 
    261261    if ( !$double_encode ) { 
     
    582582 * Sanitizes a filename replacing whitespace with dashes 
    583583 * 
    584  * Removes special characters that are illegal in filenames on certain  
    585  * operating systems and special characters requiring special escaping  
    586  * to manipulate at the command line. Replaces spaces and consecutive  
     584 * Removes special characters that are illegal in filenames on certain 
     585 * operating systems and special characters requiring special escaping 
     586 * to manipulate at the command line. Replaces spaces and consecutive 
    587587 * dashes with a single dash. Trim period, dash and underscore from beginning 
    588588 * and end of filename. 
     
    721721/** 
    722722 * Santizes a html classname to ensure it only contains valid characters 
    723  *  
     723 * 
    724724 * Strips the string down to A-Z,a-z,0-9,'-' if this results in an empty 
    725725 * string then it will return the alternative value supplied. 
    726  *  
     726 * 
    727727 * @todo Expand to support the full range of CDATA that a class attribute can contain. 
    728  *   
     728 * 
    729729 * @since 2.8.0 
    730  *   
     730 * 
    731731 * @param string $class The classname to be sanitized 
    732732 * @param string $fallback The value to return if the sanitization end's up as an empty string. 
     
    736736    //Strip out any % encoded octets 
    737737    $sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class); 
    738      
     738 
    739739    //Limit to A-Z,a-z,0-9,'-' 
    740740    $sanitized = preg_replace('/[^A-Za-z0-9-]/', '', $sanitized); 
    741      
     741 
    742742    if ('' == $sanitized) 
    743743        $sanitized = $fallback; 
    744      
    745     return apply_filters('sanitize_html_class',$sanitized, $class, $fallback);   
     744 
     745    return apply_filters('sanitize_html_class',$sanitized, $class, $fallback); 
    746746} 
    747747 
     
    22162216 * @deprecated 2.8.0 
    22172217 * @see esc_attr() 
    2218  *  
     2218 * 
    22192219 * @param string $text 
    22202220 * @return string 
  • trunk/wp-includes/functions.php

    r11434 r11450  
    142142 
    143143    $num = number_format( $number, $decimals, $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] ); 
    144    
     144 
    145145    // let the user translate digits from latin to localized language 
    146146    return apply_filters( 'number_format_i18n', $num ); 
     
    480480 * first is the new value and the second is the old value.  Whatever is 
    481481 * returned will be used as the new value. 
    482  *  
     482 * 
    483483 * After the value has been updated the action named 'update_option_$option_name' 
    484484 * will be called.  This action receives two parameters the first being the old 
     
    20362036    $ext = !empty($info['extension']) ? $info['extension'] : ''; 
    20372037    $name = basename($filename, ".{$ext}"); 
    2038      
     2038 
    20392039    // edge case: if file is named '.ext', treat as an empty name 
    20402040    if( $name === ".$ext" ) 
     
    23672367    $defaults = array( 'response' => 500 ); 
    23682368    $r = wp_parse_args($args, $defaults); 
    2369      
     2369 
    23702370    $have_gettext = function_exists('__'); 
    23712371 
     
    23912391        $message = "<p>$message</p>"; 
    23922392    } 
    2393      
     2393 
    23942394    if ( isset( $r['back_link'] ) && $r['back_link'] ) { 
    23952395        $back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back'; 
    23962396        $message .= "\n<p><a href='javascript:history.back()'>$back_text</p>"; 
    23972397    } 
    2398      
     2398 
    23992399    if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL ) 
    24002400        $admin_dir = WP_SITEURL . '/wp-admin/'; 
     
    24122412        header( 'Content-Type: text/html; charset=utf-8' ); 
    24132413    } 
    2414      
     2414 
    24152415    if ( empty($title) ) { 
    24162416        $title = $have_gettext? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error'; 
     
    26842684 */ 
    26852685function wp_ob_end_flush_all() { 
    2686     $levels = ob_get_level();  
    2687     for ($i=0; $i<$levels; $i++)  
    2688         ob_end_flush();  
     2686    $levels = ob_get_level(); 
     2687    for ($i=0; $i<$levels; $i++) 
     2688        ob_end_flush(); 
    26892689} 
    26902690 
     
    31653165            return strnatcasecmp($a_continent, $b_continent); 
    31663166        ')); 
    3167      
     3167 
    31683168    $structure = ''; 
    31693169    $pad = '&nbsp;&nbsp;&nbsp;'; 
  • trunk/wp-includes/general-template.php

    r11448 r11450  
    209209 */ 
    210210function wp_lostpassword_url($redirect = '') { 
    211     $args = array( 'action' => 'lostpassword' );     
     211    $args = array( 'action' => 'lostpassword' ); 
    212212    if ( !empty($redirect) ) { 
    213213        $args['redirect_to'] = $redirect; 
  • trunk/wp-includes/http.php

    r11355 r11450  
    282282        } else { 
    283283            if ( is_array( $r['body'] ) || is_object( $r['body'] ) ) { 
    284                 if ( ! version_compare(phpversion(), '5.1.2', '>=') )  
     284                if ( ! version_compare(phpversion(), '5.1.2', '>=') ) 
    285285                    $r['body'] = _http_build_query($r['body'], null, '&'); 
    286286                else 
  • trunk/wp-includes/link-template.php

    r11426 r11450  
    14341434 * 
    14351435 * @param string|array $args Optional args. 
    1436  * @return string The posts link navigation.  
     1436 * @return string The posts link navigation. 
    14371437 */ 
    14381438function get_posts_nav_link( $args = array() ) { 
    14391439    global $wp_query; 
    1440      
     1440 
    14411441    $return = ''; 
    14421442 
    14431443    if ( !is_singular() ) { 
    14441444        $defaults = array( 
    1445             'sep' => ' &#8212; ',  
    1446             'prelabel' => __('&laquo; Previous Page'),  
     1445            'sep' => ' &#8212; ', 
     1446            'prelabel' => __('&laquo; Previous Page'), 
    14471447            'nxtlabel' => __('Next Page &raquo;'), 
    14481448        ); 
  • trunk/wp-includes/media.php

    r11339 r11450  
    611611function gallery_shortcode($attr) { 
    612612    global $post; 
    613      
     613 
    614614    static $instance = 0; 
    615615    $instance++; 
     
    655655    $columns = intval($columns); 
    656656    $itemwidth = $columns > 0 ? floor(100/$columns) : 100; 
    657      
     657 
    658658    $selector = "gallery-{$instance}"; 
    659659 
  • trunk/wp-includes/pluggable.php

    r11387 r11450  
    955955 
    956956    if ( $comment->user_id == $post->post_author ) return false; // The author moderated a comment on his own post 
    957      
     957 
    958958    if ('' == $user->user_email) return false; // If there's no email to send the comment to 
    959959 
  • trunk/wp-includes/post-template.php

    r11435 r11450  
    312312 
    313313    $classes = array(); 
    314      
     314 
    315315    $classes[] = 'post-' . $post->ID; 
    316316    $classes[] = $post->post_type; 
  • trunk/wp-includes/post.php

    r11410 r11450  
    11981198    } 
    11991199 
    1200     wp_clear_scheduled_hook('publish_future_post', $postid);  
    1201      
     1200    wp_clear_scheduled_hook('publish_future_post', $postid); 
     1201 
    12021202    do_action('deleted_post', $postid); 
    12031203 
     
    17351735 * @param string $post_type 
    17361736 * @param integer $post_parent 
    1737  * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)  
     1737 * @return string unique slug for the post, based on $post_name (with a -1, -2, etc. suffix) 
    17381738 */ 
    17391739function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) { 
     
    17481748            $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID, $post_parent)); 
    17491749        } 
    1750          
     1750 
    17511751        if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) { 
    17521752            $suffix = 2; 
  • trunk/wp-includes/query.php

    r11420 r11450  
    19091909            if ( empty($q[$item]) ) continue; 
    19101910            if ( in_array($item, $tagin) && empty($q['cat']) ) continue; // We should already have what we need if categories aren't being used 
    1911              
     1911 
    19121912            if ( $item != 'category__and' ) { 
    19131913                $reqtag = is_term( $q[$item][0], 'post_tag' ); 
     
    26632663 
    26642664    do_action_ref_array('the_post', array(&$post)); 
    2665      
     2665 
    26662666    $id = (int) $post->ID; 
    26672667 
  • trunk/wp-includes/rewrite.php

    r11419 r11450  
    17041704        return $rules; 
    17051705    } 
    1706      
     1706 
    17071707    /** 
    17081708     * Retrieve IIS7 URL Rewrite formatted rewrite rules to write to web.config file. 
     
    17111711     * the process that will. 
    17121712     * 
    1713      * @since 2.8.0  
     1713     * @since 2.8.0 
    17141714     * @access public 
    17151715     * 
     
    17171717     */ 
    17181718    function iis7_url_rewrite_rules(){ 
    1719          
     1719 
    17201720        if ( ! $this->using_permalinks()) { 
    17211721            return ''; 
     
    17291729        $rules .= " <action type=\"Rewrite\" url=\"index.php\" />\n"; 
    17301730        $rules .= "</rule>"; 
    1731                  
     1731 
    17321732        $rules = apply_filters('iis7_url_rewrite_rules', $rules); 
    1733          
     1733 
    17341734        return $rules; 
    17351735    } 
     
    18751875     * between the current permalink structure and the parameter value. Calls 
    18761876     * {@link WP_Rewrite::init()} after the option is updated. 
    1877      *  
     1877     * 
    18781878     * Fires the 'permalink_structure_changed' action once the init call has 
    18791879     * processed passing the old and new values 
  • trunk/wp-includes/script-loader.php

    r11445 r11450  
    423423    // all colors stylesheets need to have the same query strings (cache manifest compat) 
    424424    $colors_version = '20090522'; 
    425      
     425 
    426426    $styles->add( 'wp-admin', '/wp-admin/wp-admin.css', array(), '20090522' ); 
    427427    $styles->add_data( 'wp-admin', 'rtl', '/wp-admin/rtl.css' ); 
  • trunk/wp-includes/taxonomy.php

    r11428 r11450  
    1616 */ 
    1717function create_initial_taxonomies() { 
    18     register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;  
    19     register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'), 'query_var' => false, 'rewrite' => false) ) ;  
    20     register_taxonomy( 'link_category', 'link', array('hierarchical' => false, 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ;  
     18    register_taxonomy( 'category', 'post', array('hierarchical' => true, 'update_count_callback' => '_update_post_term_count', 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ; 
     19    register_taxonomy( 'post_tag', 'post', array('hierarchical' => false, 'update_count_callback' => '_update_post_term_count', 'label' => __('Post Tags'), 'query_var' => false, 'rewrite' => false) ) ; 
     20    register_taxonomy( 'link_category', 'link', array('hierarchical' => false, 'label' => __('Categories'), 'query_var' => false, 'rewrite' => false) ) ; 
    2121} 
    2222add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority 
     
    168168    global $wp_taxonomies, $wp_rewrite, $wp; 
    169169 
    170     if (!is_array($wp_taxonomies))  
     170    if (!is_array($wp_taxonomies)) 
    171171        $wp_taxonomies = array(); 
    172172 
     
    526526 * the $args. 
    527527 * 
    528  * The 'get_terms_orderby' filter passes the ORDER BY clause for the query  
     528 * The 'get_terms_orderby' filter passes the ORDER BY clause for the query 
    529529 * along with the $args array. 
    530530 
     
    534534 * The list of arguments that $args can contain, which will overwrite the defaults: 
    535535 * 
    536  * orderby - Default is 'name'. Can be name, count, term_group, slug or nothing  
     536 * orderby - Default is 'name'. Can be name, count, term_group, slug or nothing 
    537537 * (will use term_id), Passing a custom value other than these will cause it to 
    538538 * order based on the custom value. 
    539  *  
     539 * 
    540540 * order - Default is ASC. Can use DESC. 
    541541 * 
     
    681681    else if ( 'term_group' == $_orderby ) 
    682682        $orderby = 't.term_group'; 
    683     elseif ( empty($_orderby) || 'id' == $_orderby )  
     683    elseif ( empty($_orderby) || 'id' == $_orderby ) 
    684684        $orderby = 't.term_id'; 
    685685 
     
    872872 
    873873    $term = trim( stripslashes( $term ) ); 
    874      
     874 
    875875    if ( '' === $slug = sanitize_title($term) ) 
    876876        return 0; 
  • trunk/wp-includes/theme.php

    r11383 r11450  
    885885    } 
    886886 
    887     // Prevent theme mods to current theme being used on theme being previewed  
     887    // Prevent theme mods to current theme being used on theme being previewed 
    888888    add_filter( 'pre_option_mods_' . get_current_theme(), create_function( '', "return array();" ) ); 
    889889 
  • trunk/wp-includes/widgets.php

    r11427 r11450  
    174174            $settings = $settings[$this->number]; 
    175175            // filters the widget's settings, return false to stop displaying the widget 
    176             $settings = apply_filters('widget_display_callback', $settings, $this, $args);    
     176            $settings = apply_filters('widget_display_callback', $settings, $this, $args); 
    177177            if ( false !== $settings ) 
    178178                $this->widget($args, $settings); 
     
    286286    function get_settings() { 
    287287        $settings = get_option($this->option_name); 
    288          
     288 
    289289        if ( false === $settings && isset($this->alt_option_name) ) 
    290290            $settings = get_option($this->alt_option_name); 
     
    773773    $did_one = false; 
    774774    foreach ( (array) $sidebars_widgets[$index] as $id ) { 
    775          
     775 
    776776        if ( !isset($wp_registered_widgets[$id]) ) continue; 
    777          
     777 
    778778        $params = array_merge( 
    779779            array( array_merge( $sidebar, array('widget_id' => $id, 'widget_name' => $wp_registered_widgets[$id]['name']) ) ), 
     
    814814 * With the $widget_id parameter, returns the ID of the sidebar where 
    815815 * the widget with that callback/$id_base AND that ID is found. 
    816  *  
     816 * 
    817817 * NOTE: $widget_id and $id_base are the same for single widgets. To be effective 
    818818 * this function has to run after widgets have initialized, at action 'init' or later. 
     
    835835            if ( $skip_inactive && 'wp_inactive_widgets' == $sidebar ) 
    836836                continue; 
    837              
     837 
    838838            if ( is_array($widgets) ) { 
    839839                foreach ( $widgets as $widget ) { 
     
    879879function is_active_sidebar( $index ) { 
    880880    $index = ( is_int($index) ) ? "sidebar-$index" : sanitize_title($index); 
    881     $sidebars_widgets = get_option( 'sidebars_widgets', array() );   
    882     if ( isset($sidebars_widgets[$index]) && !empty($sidebars_widgets[$index]) )  
     881    $sidebars_widgets = get_option( 'sidebars_widgets', array() ); 
     882    if ( isset($sidebars_widgets[$index]) && !empty($sidebars_widgets[$index]) ) 
    883883        return true; 
    884884 
     
    10571057            $sidebars_widgets = &$GLOBALS['_wp_sidebars_widgets']; 
    10581058        } 
    1059          
     1059 
    10601060        foreach ( (array) $sidebars_widgets as $index => $sidebar ) { 
    10611061            if ( is_array($sidebar) ) { 
  • trunk/wp-login.php

    r11291 r11450  
    148148    $message .= __('To reset your password visit the following address, otherwise just ignore this email and nothing will happen.') . "\r\n\r\n"; 
    149149    $message .= site_url("wp-login.php?action=rp&key=$key", 'login') . "\r\n"; 
    150      
     150 
    151151    $title = sprintf(__('[%s] Password Reset'), get_option('blogname')); 
    152      
     152 
    153153    $title = apply_filters('retrieve_password_title', $title); 
    154154    $message = apply_filters('retrieve_password_message', $message, $key); 
    155      
     155 
    156156    if ( $message && !wp_mail($user_email, $title, $message) ) 
    157157        die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>'); 
     
    182182    // Generate something random for a password... 
    183183    $new_pass = wp_generate_password(); 
    184      
     184 
    185185    do_action('password_reset', $user, $new_pass); 
    186186 
     
    195195    $title = apply_filters('password_reset_title', $title); 
    196196    $message = apply_filters('password_reset_message', $message, $new_pass); 
    197    
     197 
    198198    if ( $message && !wp_mail($user->user_email, $title, $message) ) 
    199199        die('<p>' . __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function...') . '</p>'); 
Note: See TracChangeset for help on using the changeset viewer.