WordPress.org

Make WordPress Core

Changeset 15355


Ignore:
Timestamp:
06/30/10 00:05:18 (4 years ago)
Author:
dd32
Message:

Alot more tabs. Props jacobsantos & Viper007bond. See #14147

Location:
trunk/wp-includes
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/capabilities.php

    r15311 r15355  
    10801080    $current_user = wp_get_current_user(); 
    10811081 
    1082     if ( is_multisite() && is_super_admin() ) 
     1082    if ( is_multisite() && is_super_admin() ) 
    10831083        return true; 
    10841084 
  • trunk/wp-includes/category-template.php

    r15220 r15355  
    732732    endswitch; 
    733733 
    734     if ( $filter ) 
     734    if ( $filter ) 
    735735        return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args ); 
    736     else 
     736    else 
    737737        return $return; 
    738738} 
  • trunk/wp-includes/comment-template.php

    r15148 r15355  
    679679 */ 
    680680function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) { 
    681     if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' ); 
    682     if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' ); 
    683     if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' ); 
     681    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' ); 
     682    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' ); 
     683    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' ); 
    684684    $type = get_comment_type(); 
    685685    switch( $type ) { 
     
    947947    global $id, $wpcommentspopupfile, $wpcommentsjavascript; 
    948948 
    949     if ( false === $zero ) $zero = __( 'No Comments' ); 
    950     if ( false === $one ) $one = __( '1 Comment' ); 
    951     if ( false === $more ) $more = __( '% Comments' ); 
    952     if ( false === $none ) $none = __( 'Comments Off' ); 
     949    if ( false === $zero ) $zero = __( 'No Comments' ); 
     950    if ( false === $one ) $one = __( '1 Comment' ); 
     951    if ( false === $more ) $more = __( '% Comments' ); 
     952    if ( false === $none ) $none = __( 'Comments Off' ); 
    953953 
    954954    $number = get_comments_number( $id ); 
  • trunk/wp-includes/cron.php

    r14414 r15355  
    9191    $now = time(); 
    9292 
    93     if ( $timestamp >= $now ) 
    94         $timestamp = $now + $interval; 
    95     else 
    96         $timestamp = $now + ($interval - (($now - $timestamp) % $interval)); 
     93    if ( $timestamp >= $now ) 
     94        $timestamp = $now + $interval; 
     95    else 
     96        $timestamp = $now + ($interval - (($now - $timestamp) % $interval)); 
    9797 
    9898    wp_schedule_event( $timestamp, $recurrence, $hook, $args ); 
  • trunk/wp-includes/formatting.php

    r15227 r15355  
    28272827 */ 
    28282828function capital_P_dangit( $text ) { 
    2829        return str_replace( 'Wordpress', 'WordPress', $text ); 
     2829    return str_replace( 'Wordpress', 'WordPress', $text ); 
    28302830} 
    28312831 
  • trunk/wp-includes/functions.php

    r15354 r15355  
    670670    global $_wp_using_ext_object_cache; 
    671671 
    672     do_action( 'delete_transient_' . $transient, $transient ); 
     672    do_action( 'delete_transient_' . $transient, $transient ); 
    673673 
    674674    if ( $_wp_using_ext_object_cache ) { 
     
    758758    global $_wp_using_ext_object_cache; 
    759759 
    760     $value = apply_filters( 'pre_set_transient_' . $transient, $value ); 
     760    $value = apply_filters( 'pre_set_transient_' . $transient, $value ); 
    761761 
    762762    if ( $_wp_using_ext_object_cache ) { 
     
    37853785    global $_wp_using_ext_object_cache; 
    37863786 
    3787     $value = apply_filters( 'pre_set_site_transient_' . $transient, $value ); 
     3787    $value = apply_filters( 'pre_set_site_transient_' . $transient, $value ); 
    37883788 
    37893789    if ( $_wp_using_ext_object_cache ) { 
  • trunk/wp-includes/general-template.php

    r15227 r15355  
    15431543 * @param string $before Optional Output before the date. 
    15441544 * @param string $after Optional Output after the date. 
    1545   */ 
     1545 */ 
    15461546function the_weekday_date($before='',$after='') { 
    15471547    global $wp_locale, $post, $day, $previousweekday; 
  • trunk/wp-includes/link-template.php

    r15117 r15355  
    22292229 */ 
    22302230function wp_shortlink_header() { 
    2231     if ( headers_sent() ) 
     2231    if ( headers_sent() ) 
    22322232        return; 
    22332233 
  • trunk/wp-includes/post-thumbnail-template.php

    r13382 r15355  
    5858 * @param string $size Optional. Image size.  Defaults to 'thumbnail'. 
    5959 * @param string|array $attr Optional. Query string or array of attributes. 
    60   */ 
     60 */ 
    6161function get_the_post_thumbnail( $post_id = NULL, $size = 'post-thumbnail', $attr = '' ) { 
    6262    global $id; 
  • trunk/wp-includes/post.php

    r15348 r15355  
    35063506            $del_file = path_join( dirname($meta['file']), $size['file'] ); 
    35073507            $del_file = apply_filters('wp_delete_file', $del_file); 
    3508             @ unlink( path_join($uploadpath['basedir'], $del_file) ); 
     3508            @ unlink( path_join($uploadpath['basedir'], $del_file) ); 
    35093509        } 
    35103510    } 
     
    35793579            if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location 
    35803580                $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location 
    3581             elseif ( false !== strpos($file, 'wp-content/uploads') ) 
    3582                 $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); 
    3583             else 
    3584                 $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. 
     3581            elseif ( false !== strpos($file, 'wp-content/uploads') ) 
     3582                $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); 
     3583            else 
     3584                $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. 
    35853585        } 
    35863586    } 
  • trunk/wp-includes/taxonomy.php

    r15220 r15355  
    982982    $selects = array(); 
    983983    switch ( $fields ) { 
    984         case 'all': 
    985             $selects = array('t.*', 'tt.*'); 
    986             break; 
    987         case 'ids': 
     984        case 'all': 
     985            $selects = array('t.*', 'tt.*'); 
     986            break; 
     987        case 'ids': 
    988988        case 'id=>parent': 
    989             $selects = array('t.term_id', 'tt.parent', 'tt.count'); 
    990             break; 
    991         case 'names': 
    992             $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name'); 
    993             break; 
    994         case 'count': 
     989            $selects = array('t.term_id', 'tt.parent', 'tt.count'); 
     990            break; 
     991        case 'names': 
     992            $selects = array('t.term_id', 'tt.parent', 'tt.count', 't.name'); 
     993            break; 
     994        case 'count': 
    995995            $orderby = ''; 
    996996            $order = ''; 
    997             $selects = array('COUNT(*)'); 
    998     } 
    999     $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args )); 
     997            $selects = array('COUNT(*)'); 
     998    } 
     999    $select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args )); 
    10001000 
    10011001    $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit"; 
  • trunk/wp-includes/user.php

    r15235 r15355  
    753753    } 
    754754 
    755     $metas = get_user_metavalues($ids); 
     755    $metas = get_user_metavalues($ids); 
    756756 
    757757    foreach($users as $user_object) { 
    758758        if (isset($metas[$user_object->ID])) { 
    759             _fill_single_user($user_object, $metas[$user_object->ID]); 
     759            _fill_single_user($user_object, $metas[$user_object->ID]); 
    760760        } 
    761761    } 
  • trunk/wp-includes/wp-db.php

    r15266 r15355  
    791791     * Escape data. Works on arrays. 
    792792     * 
    793     * @uses wpdb::_escape() 
    794     * @uses wpdb::_real_escape() 
     793    * @uses wpdb::_escape() 
     794    * @uses wpdb::_real_escape() 
    795795     * @since  2.8 
    796796     * @access private 
Note: See TracChangeset for help on using the changeset viewer.