WordPress.org

Make WordPress Core

Changeset 14222


Ignore:
Timestamp:
04/24/10 17:49:08 (5 years ago)
Author:
nacin
Message:

Single quotes are way cooler.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-functions.php

    r14203 r14222  
    160160 
    161161function get_most_active_blogs( $num = 10, $display = true ) { 
    162     $most_active = get_site_option( "most_active" ); 
     162    $most_active = get_site_option( 'most_active' ); 
    163163    $update = false; 
    164164    if ( is_array( $most_active ) ) { 
     
    187187            $most_active = $t; 
    188188        } 
    189         update_site_option( "most_active", $most_active ); 
     189        update_site_option( 'most_active', $most_active ); 
    190190    } 
    191191 
     
    194194            reset( $most_active ); 
    195195            foreach ( (array) $most_active as $key => $details ) { 
    196                 $url = esc_url("http://" . $details['domain'] . $details['path']); 
    197                 echo "<li>" . $details['postcount'] . " <a href='$url'>$url</a></li>"; 
     196                $url = esc_url('http://' . $details['domain'] . $details['path']); 
     197                echo '<li>' . $details['postcount'] . " <a href='$url'>$url</a></li>"; 
    198198            } 
    199199        } 
     
    205205    global $wpdb; 
    206206 
    207     $count_ts = get_site_option( "user_count_ts" ); 
     207    $count_ts = get_site_option( 'user_count_ts' ); 
    208208    if ( time() - $count_ts > 3600 ) { 
    209209        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'") ); 
    210         update_site_option( "user_count", $count ); 
    211         update_site_option( "user_count_ts", time() ); 
    212     } 
    213  
    214     $count = get_site_option( "user_count" ); 
     210        update_site_option( 'user_count', $count ); 
     211        update_site_option( 'user_count_ts', time() ); 
     212    } 
     213 
     214    $count = get_site_option( 'user_count' ); 
    215215 
    216216    return $count; 
     
    223223        $id = $wpdb->siteid; 
    224224 
    225     $count_ts = get_site_option( "blog_count_ts" ); 
     225    $count_ts = get_site_option( 'blog_count_ts' ); 
    226226    if ( time() - $count_ts > 3600 ) { 
    227227        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $id) ); 
    228         update_site_option( "blog_count", $count ); 
    229         update_site_option( "blog_count_ts", time() ); 
    230     } 
    231  
    232     $count = get_site_option( "blog_count" ); 
     228        update_site_option( 'blog_count', $count ); 
     229        update_site_option( 'blog_count_ts', time() ); 
     230    } 
     231 
     232    $count = get_site_option( 'blog_count' ); 
    233233 
    234234    return $count; 
     
    238238    global $wpdb; 
    239239 
    240     $key = $blog_id . "-" . $post_id; 
    241     $post = wp_cache_get( $key, "global-posts" ); 
     240    $key = $blog_id . '-' . $post_id; 
     241    $post = wp_cache_get( $key, 'global-posts' ); 
    242242    if ( $post == false ) { 
    243         $post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM " . $wpdb->get_blog_prefix( $blog_id ) . "posts WHERE ID = %d", $post_id ) ); 
    244         wp_cache_add( $key, $post, "global-posts" ); 
     243        $post = $wpdb->get_row( $wpdb->prepare( 'SELECT * FROM ' . $wpdb->get_blog_prefix( $blog_id ) . 'posts WHERE ID = %d', $post_id ) ); 
     244        wp_cache_add( $key, $post, 'global-posts' ); 
    245245    } 
    246246 
     
    397397    if ( isset( $_GET['redirect'] ) ) { 
    398398        if ( substr( $_GET['redirect'], 0, 2 ) == 's_' ) 
    399             $url .= "&action=blogs&s=". esc_html( substr( $_GET['redirect'], 2 ) ); 
     399            $url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) ); 
    400400    } elseif ( isset( $_POST['redirect'] ) ) { 
    401401        $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] ); 
     
    430430 
    431431function is_email_address_unsafe( $user_email ) { 
    432     $banned_names = get_site_option( "banned_email_domains" ); 
     432    $banned_names = get_site_option( 'banned_email_domains' ); 
    433433    if ($banned_names && !is_array( $banned_names )) 
    434434        $banned_names = explode( "\n", $banned_names); 
     
    457457    $errors = new WP_Error(); 
    458458 
    459     $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) ); 
     459    $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) ); 
    460460    $user_email = sanitize_email( $user_email ); 
    461461 
    462462    if ( empty( $user_name ) ) 
    463         $errors->add('user_name', __("Please enter a username")); 
     463        $errors->add('user_name', __('Please enter a username')); 
    464464 
    465465    $maybe = array(); 
    466     preg_match( "/[a-z0-9]+/", $user_name, $maybe ); 
     466    preg_match( '/[a-z0-9]+/', $user_name, $maybe ); 
    467467 
    468468    if ( $user_name != $maybe[0] ) 
    469         $errors->add('user_name', __("Only lowercase letters and numbers allowed")); 
    470  
    471     $illegal_names = get_site_option( "illegal_names" ); 
     469        $errors->add('user_name', __('Only lowercase letters and numbers allowed')); 
     470 
     471    $illegal_names = get_site_option( 'illegal_names' ); 
    472472    if ( is_array( $illegal_names ) == false ) { 
    473         $illegal_names = array(  "www", "web", "root", "admin", "main", "invite", "administrator" ); 
    474         add_site_option( "illegal_names", $illegal_names ); 
     473        $illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ); 
     474        add_site_option( 'illegal_names', $illegal_names ); 
    475475    } 
    476476    if ( in_array( $user_name, $illegal_names ) == true ) 
    477         $errors->add('user_name',  __("That username is not allowed")); 
     477        $errors->add('user_name',  __('That username is not allowed')); 
    478478 
    479479    if ( is_email_address_unsafe( $user_email ) ) 
    480         $errors->add('user_email',  __("You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.")); 
     480        $errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.')); 
    481481 
    482482    if ( strlen( $user_name ) < 4 ) 
    483         $errors->add('user_name',  __("Username must be at least 4 characters")); 
    484  
    485     if ( strpos( " " . $user_name, "_" ) != false ) 
     483        $errors->add('user_name',  __('Username must be at least 4 characters')); 
     484 
     485    if ( strpos( ' ' . $user_name, '_' ) != false ) 
    486486        $errors->add( 'user_name', __( 'Sorry, usernames may not contain the character &#8220;_&#8221;!' ) ); 
    487487 
     
    490490    preg_match( '/[0-9]*/', $user_name, $match ); 
    491491    if ( $match[0] == $user_name ) 
    492         $errors->add('user_name', __("Sorry, usernames must have letters too!")); 
     492        $errors->add('user_name', __('Sorry, usernames must have letters too!')); 
    493493 
    494494    if ( !is_email( $user_email ) ) 
    495         $errors->add('user_email', __("Please enter a correct email address")); 
     495        $errors->add('user_email', __('Please enter a correct email address')); 
    496496 
    497497    $limited_email_domains = get_site_option( 'limited_email_domains' ); 
     
    499499        $emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) ); 
    500500        if ( in_array( $emaildomain, $limited_email_domains ) == false ) 
    501             $errors->add('user_email', __("Sorry, that email address is not allowed!")); 
     501            $errors->add('user_email', __('Sorry, that email address is not allowed!')); 
    502502    } 
    503503 
    504504    // Check if the username has been used already. 
    505505    if ( username_exists($user_name) ) 
    506         $errors->add('user_name', __("Sorry, that username already exists!")); 
     506        $errors->add('user_name', __('Sorry, that username already exists!')); 
    507507 
    508508    // Check if the email address has been used already. 
    509509    if ( email_exists($user_email) ) 
    510         $errors->add('user_email', __("Sorry, that email address is already used!")); 
     510        $errors->add('user_email', __('Sorry, that email address is already used!')); 
    511511 
    512512    // Has someone already signed up for this username? 
     
    520520            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_login = %s", $user_name) ); 
    521521        else 
    522             $errors->add('user_name', __("That username is currently reserved but may be available in a couple of days.")); 
     522            $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.')); 
    523523 
    524524        if ( $signup->active == 0 && $signup->user_email == $user_email ) 
    525             $errors->add('user_email_used', __("username and email used")); 
     525            $errors->add('user_email_used', __('username and email used')); 
    526526    } 
    527527 
     
    533533            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_email = %s", $user_email) ); 
    534534        else 
    535             $errors->add('user_email', __("That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.")); 
     535            $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.')); 
    536536    } 
    537537 
     
    548548 
    549549    $errors = new WP_Error(); 
    550     $illegal_names = get_site_option( "illegal_names" ); 
     550    $illegal_names = get_site_option( 'illegal_names' ); 
    551551    if ( $illegal_names == false ) { 
    552         $illegal_names = array( "www", "web", "root", "admin", "main", "invite", "administrator" ); 
    553         add_site_option( "illegal_names", $illegal_names ); 
     552        $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' ); 
     553        add_site_option( 'illegal_names', $illegal_names ); 
    554554    } 
    555555 
    556556    if ( empty( $blogname ) ) 
    557         $errors->add('blogname', __("Please enter a blog name")); 
     557        $errors->add('blogname', __('Please enter a blog name')); 
    558558 
    559559    $maybe = array(); 
    560     preg_match( "/[a-z0-9]+/", $blogname, $maybe ); 
     560    preg_match( '/[a-z0-9]+/', $blogname, $maybe ); 
    561561    if ( $blogname != $maybe[0] ) 
    562         $errors->add('blogname', __("Only lowercase letters and numbers allowed")); 
     562        $errors->add('blogname', __('Only lowercase letters and numbers allowed')); 
    563563 
    564564    if ( in_array( $blogname, $illegal_names ) == true ) 
    565         $errors->add('blogname',  __("That name is not allowed")); 
     565        $errors->add('blogname',  __('That name is not allowed')); 
    566566 
    567567    if ( strlen( $blogname ) < 4 && !is_super_admin() ) 
    568         $errors->add('blogname',  __("Blog name must be at least 4 characters")); 
    569  
    570     if ( strpos( " " . $blogname, "_" ) != false ) 
     568        $errors->add('blogname',  __('Blog name must be at least 4 characters')); 
     569 
     570    if ( strpos( ' ' . $blogname, '_' ) != false ) 
    571571        $errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) ); 
    572572 
     
    579579    preg_match( '/[0-9]*/', $blogname, $match ); 
    580580    if ( $match[0] == $blogname ) 
    581         $errors->add('blogname', __("Sorry, blog names must have letters too!")); 
    582  
    583     $blogname = apply_filters( "newblogname", $blogname ); 
     581        $errors->add('blogname', __('Sorry, blog names must have letters too!')); 
     582 
     583    $blogname = apply_filters( 'newblogname', $blogname ); 
    584584 
    585585    $blog_title = stripslashes(  $blog_title ); 
    586586 
    587587    if ( empty( $blog_title ) ) 
    588         $errors->add('blog_title', __("Please enter a blog title")); 
     588        $errors->add('blog_title', __('Please enter a blog title')); 
    589589 
    590590    // Check if the domain/path has been used already. 
     
    597597    } 
    598598    if ( domain_exists($mydomain, $path) ) 
    599         $errors->add('blogname', __("Sorry, that blog already exists!")); 
     599        $errors->add('blogname', __('Sorry, that blog already exists!')); 
    600600 
    601601    if ( username_exists( $blogname ) ) { 
    602602        if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) 
    603             $errors->add( 'blogname', __( "Sorry, that blog is reserved!" ) ); 
     603            $errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) ); 
    604604    } 
    605605 
     
    612612            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); 
    613613        else 
    614             $errors->add('blogname', __("That blog is currently reserved but may be available in a couple days.")); 
     614            $errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.')); 
    615615    } 
    616616 
     
    648648 
    649649    // Format data 
    650     $user = preg_replace( "/\s+/", '', sanitize_user( $user, true ) ); 
     650    $user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) ); 
    651651    $user_email = sanitize_email( $user_email ); 
    652652    $key = substr( md5( time() . rand() . $user_email ), 0, 16 ); 
     
    681681 
    682682    $activate_url = esc_url($activate_url); 
    683     $admin_email = get_site_option( "admin_email" ); 
     683    $admin_email = get_site_option( 'admin_email' ); 
    684684    if ( $admin_email == '' ) 
    685685        $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    686     $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) ); 
     686    $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    687687    $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    688688    $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key ); 
     
    698698 
    699699    // Send email with activation link. 
    700     $admin_email = get_site_option( "admin_email" ); 
     700    $admin_email = get_site_option( 'admin_email' ); 
    701701    if ( $admin_email == '' ) 
    702702        $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    703     $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) ); 
     703    $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    704704    $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    705705    $message = sprintf( apply_filters( 'wpmu_signup_user_notification_email', __( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\n" ) ), site_url( "wp-activate.php?key=$key" ), $key ); 
     
    780780 
    781781function wpmu_create_user( $user_name, $password, $email) { 
    782     $user_name = preg_replace( "/\s+/", '', sanitize_user( $user_name, true ) ); 
     782    $user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) ); 
    783783 
    784784    $user_id = wp_create_user( $user_name, $password, $email ); 
     
    796796 
    797797function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) { 
    798     $domain = preg_replace( "/\s+/", '', sanitize_user( $domain, true ) ); 
     798    $domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) ); 
    799799 
    800800    if ( is_subdomain_install() ) 
     
    811811        return new WP_Error('blog_taken', __('Blog already exists.')); 
    812812 
    813     if ( !defined("WP_INSTALLING") ) 
    814         define( "WP_INSTALLING", true ); 
     813    if ( !defined('WP_INSTALLING') ) 
     814        define( 'WP_INSTALLING', true ); 
    815815 
    816816    if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) 
     
    857857    restore_current_blog(); 
    858858 
    859     $msg = sprintf( __( "New Blog: %1s 
     859    $msg = sprintf( __( 'New Blog: %1s 
    860860URL: %2s 
    861861Remote IP: %3s 
    862862 
    863 Disable these notifications: %4s"), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url); 
     863Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url); 
    864864    $msg = apply_filters( 'newblog_notify_siteadmin', $msg ); 
    865865 
    866     wp_mail( $email, sprintf( __( "New Blog Registration: %s" ), $siteurl ), $msg ); 
     866    wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg ); 
    867867    return true; 
    868868} 
     
    880880 
    881881    $options_site_url = esc_url(network_admin_url('ms-options.php')); 
    882     $msg = sprintf(__("New User: %1s 
     882    $msg = sprintf(__('New User: %1s 
    883883Remote IP: %2s 
    884884 
    885 Disable these notifications: %3s"), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url); 
     885Disable these notifications: %3s'), $user->user_login, $_SERVER['REMOTE_ADDR'], $options_site_url); 
    886886 
    887887    $msg = apply_filters( 'newuser_notify_siteadmin', $msg ); 
    888     wp_mail( $email, sprintf(__("New User Registration: %s"), $user->user_login), $msg ); 
     888    wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg ); 
    889889    return true; 
    890890} 
     
    988988    $user = new WP_User($user_id); 
    989989 
    990     $welcome_email = str_replace( "SITE_NAME", $current_site->site_name, $welcome_email ); 
    991     $welcome_email = str_replace( "BLOG_TITLE", $title, $welcome_email ); 
    992     $welcome_email = str_replace( "BLOG_URL", $url, $welcome_email ); 
    993     $welcome_email = str_replace( "USERNAME", $user->user_login, $welcome_email ); 
    994     $welcome_email = str_replace( "PASSWORD", $password, $welcome_email ); 
    995  
    996     $welcome_email = apply_filters( "update_welcome_email", $welcome_email, $blog_id, $user_id, $password, $title, $meta); 
    997     $admin_email = get_site_option( "admin_email" ); 
     990    $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email ); 
     991    $welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email ); 
     992    $welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email ); 
     993    $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email ); 
     994    $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email ); 
     995 
     996    $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta); 
     997    $admin_email = get_site_option( 'admin_email' ); 
    998998 
    999999    if ( $admin_email == '' ) 
    10001000        $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    10011001 
    1002     $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) ); 
     1002    $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    10031003    $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    10041004    $message = $welcome_email; 
    10051005 
    10061006    if ( empty( $current_site->site_name ) ) 
    1007         $current_site->site_name = "WordPress MU"; 
     1007        $current_site->site_name = 'WordPress MU'; 
    10081008 
    10091009    $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); 
     
    10221022    $user = new WP_User($user_id); 
    10231023 
    1024     $welcome_email = apply_filters( "update_welcome_user_email", $welcome_email, $user_id, $password, $meta); 
    1025     $welcome_email = str_replace( "SITE_NAME", $current_site->site_name, $welcome_email ); 
    1026     $welcome_email = str_replace( "USERNAME", $user->user_login, $welcome_email ); 
    1027     $welcome_email = str_replace( "PASSWORD", $password, $welcome_email ); 
    1028     $welcome_email = str_replace( "LOGINLINK", wp_login_url(), $welcome_email ); 
    1029  
    1030     $admin_email = get_site_option( "admin_email" ); 
     1024    $welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta); 
     1025    $welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email ); 
     1026    $welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email ); 
     1027    $welcome_email = str_replace( 'PASSWORD', $password, $welcome_email ); 
     1028    $welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email ); 
     1029 
     1030    $admin_email = get_site_option( 'admin_email' ); 
    10311031 
    10321032    if ( $admin_email == '' ) 
    10331033        $admin_email = 'support@' . $_SERVER['SERVER_NAME']; 
    10341034 
    1035     $from_name = get_site_option( "site_name" ) == '' ? 'WordPress' : esc_html( get_site_option( "site_name" ) ); 
     1035    $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); 
    10361036    $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; 
    10371037    $message = $welcome_email; 
    10381038 
    10391039    if ( empty( $current_site->site_name ) ) 
    1040         $current_site->site_name = "WordPress MU"; 
     1040        $current_site->site_name = 'WordPress MU'; 
    10411041 
    10421042    $subject = apply_filters( 'update_welcome_user_subject', sprintf(__('New %1$s User: %2$s'), $current_site->site_name, $user->user_login) ); 
     
    11621162 
    11631163function check_upload_mimes( $mimes ) { 
    1164     $site_exts = explode( " ", get_site_option( "upload_filetypes" ) ); 
     1164    $site_exts = explode( ' ', get_site_option( 'upload_filetypes' ) ); 
    11651165    foreach ( $site_exts as $ext ) { 
    11661166        foreach ( $mimes as $ext_pattern => $mime ) { 
     
    11741174function update_posts_count( $deprecated = '' ) { 
    11751175    global $wpdb; 
    1176     update_option( "post_count", (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) ); 
     1176    update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) ); 
    11771177} 
    11781178 
     
    12691269        return $upload; 
    12701270 
    1271     if ( strlen( $upload[ 'bits' ] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) 
    1272         return sprintf(__( "This file is too big. Files must be less than %dKb in size.<br />" ), get_site_option( 'fileupload_maxk', 1500 )); 
     1271    if ( strlen( $upload['bits'] )  > ( 1024 * get_site_option( 'fileupload_maxk', 1500 ) ) ) 
     1272        return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 )); 
    12731273 
    12741274    return $upload; 
     
    13171317        $key = array_pop( $parts ); 
    13181318 
    1319     $details = get_option( "new_user_" . $key ); 
     1319    $details = get_option( 'new_user_' . $key ); 
    13201320    add_existing_user_to_blog( $details ); 
    13211321    delete_option( 'new_user_' . $key ); 
     
    13261326    if ( is_array( $details ) ) { 
    13271327        add_user_to_blog( '', $details[ 'user_id' ], $details[ 'role' ] ); 
    1328         do_action( "added_existing_user", $details[ 'user_id' ] ); 
     1328        do_action( 'added_existing_user', $details[ 'user_id' ] ); 
    13291329    } 
    13301330} 
     
    13961396        $blog_id = $wpdb->blogid; 
    13971397 
    1398     $local_key = $wpdb->base_prefix . $blog_id . "_" . $key; 
     1398    $local_key = $wpdb->base_prefix . $blog_id . '_' . $key; 
    13991399 
    14001400    if ( isset( $current_user->$local_key ) ) 
     
    14151415function welcome_user_msg_filter( $text ) { 
    14161416    if ( !$text ) { 
    1417         return __( "Dear User, 
     1417        return __( 'Dear User, 
    14181418 
    14191419Your new account is set up. 
     
    14261426Thanks! 
    14271427 
    1428 --The Team @ SITE_NAME" ); 
     1428--The Team @ SITE_NAME' ); 
    14291429    } 
    14301430    return $text; 
Note: See TracChangeset for help on using the changeset viewer.