Changeset 3272

Show
Ignore:
Timestamp:
12/05/05 16:58:26 (3 years ago)
Author:
ryan
Message:

i18n fix from pandem. fixes #2028

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/comment-functions.php

    r3271 r3272  
    865865        } elseif( $author != '' && $email != '' ) { 
    866866            $ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1"); 
    867             if ( 1 == $ok_to_comment && false === strpos( $email, get_settings('moderation_keys')) ) 
    868                 return true; 
     867            if ( ( 1 == $ok_to_comment ) && 
     868                ( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) 
     869                    return true; 
    869870            else 
    870871                return false; 

  • trunk/wp-register.php

    r3134 r3272  
    110110    <label for="user_login"><?php _e('Username:') ?></label><br /> <input type="text" name="user_login" id="user_login" size="20" maxlength="20" value="<?php echo $user_login; ?>" /><br /></p> 
    111111    <p><label for="user_email"><?php _e('E-mail:') ?></label><br /> <input type="text" name="user_email" id="user_email" size="25" maxlength="100" value="<?php echo $user_email; ?>" /></p> 
    112     <p>A password will be emailed to you.</p> 
     112    <p><?php _e('A password will be emailed to you.') ?></p> 
    113113    <p class="submit"><input type="submit" value="<?php _e('Register') ?> &raquo;" id="submit" name="submit" /></p> 
    114114</form>