Show
Ignore:
Timestamp:
10/30/07 16:49:38 (9 months ago)
Author:
donncha
Message:

Merge with WordPress? 2.3.1

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/schema.php

    r1125 r1139  
    55$charset_collate = ''; 
    66 
    7 if ( $wpdb->supports_collation() ) { 
     7if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) { 
    88        if ( ! empty($wpdb->charset) ) 
    99                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset"; 
    …… 
    335335 
    336336        // Add roles 
    337         add_role('administrator', _c('Administrator|User role')); 
    338         add_role('editor', _c('Editor|User role')); 
    339         add_role('author', _c('Author|User role')); 
    340         add_role('contributor', _c('Contributor|User role')); 
    341         add_role('subscriber', _c('Subscriber|User role')); 
     337        add_role('administrator', __('Administrator')); 
     338        add_role('editor', __('Editor')); 
     339        add_role('author', __('Author')); 
     340        add_role('contributor', __('Contributor')); 
     341        add_role('subscriber', __('Subscriber')); 
    342342 
    343343        // Add caps for Administrator role