WordPress.org

Make WordPress Core

Ticket #8779: standardized_function_names.2.diff

File standardized_function_names.2.diff, 49.0 KB (added by filosofo, 9 years ago)
  • wp-login.php

     
    106106                        $errors->add('invalid_email', __('<strong>ERROR</strong>: There is no user registered with that email address.'));
    107107        } else {
    108108                $login = trim($_POST['user_login']);
    109                 $user_data = get_userdatabylogin($login);
     109                $user_data = get_user_data_by_login($login);
    110110        }
    111111
    112112        do_action('lostpassword_post');
     
    252252
    253253nocache_headers();
    254254
    255 header('Content-Type: '.get_bloginfo('html_type').'; charset='.get_bloginfo('charset'));
     255header('Content-Type: '.get_blog_info('html_type').'; charset='.get_blog_info('charset'));
    256256
    257257if ( defined('RELOCATE') ) { // Move flag is set
    258258        if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
     
    323323
    324324</div>
    325325
    326 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     326<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_blog_info('title', 'display' )); ?></a></p>
    327327
    328328<script type="text/javascript">
    329329try{document.getElementById('user_login').focus();}catch(e){}
     
    391391
    392392</div>
    393393
    394 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     394<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_blog_info('title', 'display' )); ?></a></p>
    395395
    396396<script type="text/javascript">
    397397try{document.getElementById('user_login').focus();}catch(e){}
     
    408408        // If the user wants ssl but the session is not ssl, force a secure cookie.
    409409        if ( !empty($_POST['log']) && !force_ssl_admin() ) {
    410410                $user_name = sanitize_user($_POST['log']);
    411                 if ( $user = get_userdatabylogin($user_name) ) {
     411                if ( $user = get_user_data_by_login($user_name) ) {
    412412                        if ( get_user_option('use_ssl', $user->ID) ) {
    413413                                $secure_cookie = true;
    414414                                force_ssl_admin(true);
     
    494494
    495495</div>
    496496
    497 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
     497<p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_blog_info('title', 'display' )); ?></a></p>
    498498
    499499<script type="text/javascript">
    500500<?php if ( $user_login ) { ?>
  • wp-rdf.php

     
    77 */
    88
    99require( './wp-load.php' );
    10 wp_redirect( get_bloginfo( 'rdf_url' ), 301 );
     10wp_redirect( get_blog_info( 'rdf_url' ), 301 );
    1111
    1212?>
     13 No newline at end of file
  • wp-app.php

     
    245245        function AtomServer() {
    246246
    247247                $this->script_name = array_pop(explode('/',$_SERVER['SCRIPT_NAME']));
    248                 $this->app_base = get_bloginfo('url') . '/' . $this->script_name . '/';
     248                $this->app_base = get_blog_info('url') . '/' . $this->script_name . '/';
    249249                if ( isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ) {
    250250                        $this->app_base = preg_replace( '/^http:\/\//', 'https://', $this->app_base );
    251251                }
     
    356356                        $accepted_media_types = $accepted_media_types . "<accept>" . $med . "</accept>";
    357357                }
    358358                $atom_prefix="atom";
    359                 $atom_blogname=get_bloginfo('name');
     359                $atom_blogname=get_blog_info('name');
    360360                $service_doc = <<<EOD
    361361<service xmlns="$this->ATOMPUB_NS" xmlns:$atom_prefix="$this->ATOM_NS">
    362362  <workspace>
     
    389389                if( !current_user_can( 'edit_posts' ) )
    390390                        $this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) );
    391391
    392                 $home = attribute_escape(get_bloginfo_rss('home'));
     392                $home = attribute_escape(get_blog_info_rss('home'));
    393393
    394394                $categories = "";
    395395                $cats = get_categories("hierarchical=0&hide_empty=0");
     
    10921092                $self_page = $page > 1 ? $page : NULL;
    10931093?><feed xmlns="<?php echo $this->ATOM_NS ?>" xmlns:app="<?php echo $this->ATOMPUB_NS ?>" xml:lang="<?php echo get_option('rss_language'); ?>">
    10941094<id><?php $this->the_entries_url() ?></id>
    1095 <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
     1095<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_post_modified('GMT')); ?></updated>
    10961096<title type="text"><?php bloginfo_rss('name') ?></title>
    10971097<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
    10981098<link rel="first" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url() ?>" />
     
    11041104<?php endif; ?>
    11051105<link rel="last" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($last_page) ?>" />
    11061106<link rel="self" type="<?php echo $this->ATOM_CONTENT_TYPE ?>" href="<?php $this->the_entries_url($self_page) ?>" />
    1107 <rights type="text">Copyright <?php echo mysql2date('Y', get_lastpostdate('blog')); ?></rights>
     1107<rights type="text">Copyright <?php echo mysql2date('Y', get_last_post_date('blog')); ?></rights>
    11081108<?php the_generator( 'atom' ); ?>
    11091109<?php if ( have_posts() ) {
    11101110                        while ( have_posts() ) {
     
    15421542                                $post = NULL;
    15431543                                break;
    15441544                        case $this->ENTRIES_PATH:
    1545                                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
     1545                                $wp_last_modified = mysql2date('D, d M Y H:i:s', get_last_post_modified('GMT'), 0).' GMT';
    15461546                                break;
    15471547                        default:
    15481548                                return;
  • wp-includes/feed-rss2.php

     
    2525        <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2626        <link><?php bloginfo_rss('url') ?></link>
    2727        <description><?php bloginfo_rss("description") ?></description>
    28         <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></pubDate>
     28        <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_last_post_modified('GMT'), false); ?></pubDate>
    2929        <?php the_generator( 'rss2' ); ?>
    3030        <language><?php echo get_option('rss_language'); ?></language>
    3131        <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
  • wp-includes/feed-atom.php

     
    2020        <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
    2121        <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
    2222
    23         <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
     23        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_post_modified('GMT')); ?></updated>
    2424        <?php the_generator( 'atom' ); ?>
    2525
    2626        <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
  • wp-includes/category.php

     
    173173
    174174
    175175/**
    176  * Retrieve the category name by the category ID.
    177  *
    178  * @since 0.71
    179  * @deprecated Use get_cat_name()
    180  * @see get_cat_name() get_catname() is deprecated in favor of get_cat_name().
    181  *
    182  * @param int $cat_ID Category ID
    183  * @return string category name
    184  */
    185 function get_catname( $cat_ID ) {
    186         return get_cat_name( $cat_ID );
    187 }
    188 
    189 
    190 /**
    191176 * Retrieve the name of a category from its ID.
    192177 *
    193178 * @since 1.0.0
  • wp-includes/update.php

     
    5151
    5252        $options = array(
    5353                'timeout' => 3,
    54                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
     54                'user-agent' => 'WordPress/' . $wp_version . '; ' . get_blog_info( 'url' )
    5555        );
    5656
    5757        $response = wp_remote_get($url, $options);
     
    152152        $options = array(
    153153                'timeout' => 3,
    154154                'body' => array( 'plugins' => serialize( $to_send ) ),
    155                 'user-agent' => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
     155                'user-agent' => 'WordPress/' . $wp_version . '; ' . get_blog_info( 'url' )
    156156        );
    157157
    158158        $raw_response = wp_remote_post('http://api.wordpress.org/plugins/update-check/1.0/', $options);
     
    225225        $options = array(
    226226                'timeout'               => 3,
    227227                'body'                  => array( 'themes' => serialize( $themes ) ),
    228                 'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' )
     228                'user-agent'    => 'WordPress/' . $wp_version . '; ' . get_blog_info( 'url' )
    229229        );
    230230
    231231        $raw_response = wp_remote_post( 'http://api.wordpress.org/themes/update-check/1.0/', $options );
  • wp-includes/post.php

     
    594594        $meta_cache = wp_cache_get($post_id, 'post_meta');
    595595
    596596        if ( !$meta_cache ) {
    597                 update_postmeta_cache($post_id);
     597                update_post_meta_cache($post_id);
    598598                $meta_cache = wp_cache_get($post_id, 'post_meta');
    599599        }
    600600
     
    699699        $post_id = (int) $post_id;
    700700
    701701        if ( ! wp_cache_get($post_id, 'post_meta') )
    702                 update_postmeta_cache($post_id);
     702                update_post_meta_cache($post_id);
    703703
    704704        return wp_cache_get($post_id, 'post_meta');
    705705}
     
    21832183                        foreach ( $post_authors as $post_author ) {
    21842184                                //Do we have an author id or an author login?
    21852185                                if ( 0 == intval($post_author) ) {
    2186                                         $post_author = get_userdatabylogin($post_author);
     2186                                        $post_author = get_user_data_by_login($post_author);
    21872187                                        if ( empty($post_author) )
    21882188                                                continue;
    21892189                                        if ( empty($post_author->ID) )
     
    22732273 * @return bool True on success, false on failure.
    22742274 */
    22752275function is_local_attachment($url) {
    2276         if (strpos($url, get_bloginfo('url')) === false)
     2276        if (strpos($url, get_blog_info('url')) === false)
    22772277                return false;
    2278         if (strpos($url, get_bloginfo('url') . '/?attachment_id=') !== false)
     2278        if (strpos($url, get_blog_info('url') . '/?attachment_id=') !== false)
    22792279                return true;
    22802280        if ( $id = url_to_postid($url) ) {
    22812281                $post = & get_post($id);
     
    28742874 * server time. The 'blog' value is the date when the last post was posted. The
    28752875 * 'gmt' is when the last post was posted in GMT formatted date.
    28762876 *
    2877  * @since 0.71
     2877 * @since 2.8
    28782878 *
    28792879 * @uses $wpdb
    28802880 * @uses $blog_id
     
    28862886 * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'.
    28872887 * @return string The date of the last post.
    28882888 */
    2889 function get_lastpostdate($timezone = 'server') {
     2889function get_last_post_date($timezone = 'server') {
    28902890        global $cache_lastpostdate, $wpdb, $blog_id;
    28912891        $add_seconds_server = date('Z');
    28922892        if ( !isset($cache_lastpostdate[$blog_id][$timezone]) ) {
     
    29152915 * server time. The 'blog' value is just when the last post was modified. The
    29162916 * 'gmt' is when the last post was modified in GMT time.
    29172917 *
    2918  * @since 1.2.0
     2918 * @since 2.8
    29192919 * @uses $wpdb
    29202920 * @uses $blog_id
    29212921 * @uses apply_filters() Calls 'get_lastpostmodified' filter
     
    29252925 * @param string $timezone The location to get the time. Can be 'gmt', 'blog', or 'server'.
    29262926 * @return string The date the post was last modified.
    29272927 */
    2928 function get_lastpostmodified($timezone = 'server') {
     2928function get_last_post_modified($timezone = 'server') {
    29292929        global $cache_lastpostmodified, $wpdb, $blog_id;
    29302930        $add_seconds_server = date('Z');
    29312931        if ( !isset($cache_lastpostmodified[$blog_id][$timezone]) ) {
     
    29402940                                $lastpostmodified = $wpdb->get_var("SELECT DATE_ADD(post_modified_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' ORDER BY post_modified_gmt DESC LIMIT 1");
    29412941                                break;
    29422942                }
    2943                 $lastpostdate = get_lastpostdate($timezone);
     2943                $lastpostdate = get_last_post_date($timezone);
    29442944                if ( $lastpostdate > $lastpostmodified ) {
    29452945                        $lastpostmodified = $lastpostdate;
    29462946                }
     
    30553055 * @uses $wpdb
    30563056 * @uses update_post_cache()
    30573057 * @uses update_object_term_cache()
    3058  * @uses update_postmeta_cache()
     3058 * @uses update_post_meta_cache()
    30593059 *
    30603060 * @param array $posts Array of Post objects
    30613061 */
     
    30733073
    30743074        update_object_term_cache($post_ids, 'post');
    30753075
    3076         update_postmeta_cache($post_ids);
     3076        update_post_meta_cache($post_ids);
    30773077}
    30783078
    30793079/**
     
    30853085 *
    30863086 * @package WordPress
    30873087 * @subpackage Cache
    3088  * @since 2.1.0
     3088 * @since 2.8
    30893089 *
    30903090 * @uses $wpdb
    30913091 *
    30923092 * @param array $post_ids List of post IDs.
    30933093 * @return bool|array Returns false if there is nothing to update or an array of metadata.
    30943094 */
    3095 function update_postmeta_cache($post_ids) {
     3095function update_post_meta_cache($post_ids) {
    30963096        global $wpdb;
    30973097
    30983098        if ( empty( $post_ids ) )
  • wp-includes/js/tinymce/wp-mce-help.php

     
    77
    88/** @ignore */
    99require_once('../../../wp-load.php');
    10 header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
     10header('Content-Type: text/html; charset=' . get_blog_info('charset'));
    1111?>
    1212<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
    1313<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
     
    168168</head>
    169169<body>
    170170
    171 <div id="wphead"><h1><?php echo get_bloginfo('blogtitle'); ?></h1></div>
     171<div id="wphead"><h1><?php echo get_blog_info('blogtitle'); ?></h1></div>
    172172
    173173<ul id="tabs">
    174174        <li><a id="tab1" href="javascript:flipTab(1)" title="<?php _e('Basics of Rich Editing') ?>" accesskey="1" tabindex="1" class="current"><?php _e('Basics') ?></a></li>
     
    240240        <h2><?php _e('About TinyMCE'); ?></h2>
    241241
    242242    <p><?php _e('Version:'); ?> <span id="version"></span> (<span id="date"></span>)</p>
    243         <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_bloginfo('url').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
     243        <p><?php printf(__('TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under %sLGPL</a> by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.'), '<a href="'.get_blog_info('url').'/wp-includes/js/tinymce/license.txt" target="_blank" title="'.__('GNU Library General Public Licence').'">') ?></p>
    244244        <p><?php _e('Copyright &copy; 2003-2007, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.') ?></p>
    245245        <p><?php _e('For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.') ?></p>
    246246
  • wp-includes/theme.php

     
    10511051 *
    10521052 * @return string
    10531053 */
    1054 function get_header_textcolor() {
     1054function get_header_text_color() {
    10551055        return get_theme_mod('header_textcolor', HEADER_TEXTCOLOR);
    10561056}
    10571057
     
    10611061 * @since 2.1.0
    10621062 */
    10631063function header_textcolor() {
    1064         echo get_header_textcolor();
     1064        echo get_header_text_color();
    10651065}
    10661066
    10671067/**
  • wp-includes/comment.php

     
    263263/**
    264264 * The date the last comment was modified.
    265265 *
    266  * @since 1.5.0
     266 * @since 2.8
    267267 * @uses $wpdb
    268268 * @global array $cache_lastcommentmodified
    269269 *
     
    271271 *              or 'server' locations.
    272272 * @return string Last comment modified date.
    273273 */
    274 function get_lastcommentmodified($timezone = 'server') {
     274function get_last_comment_modified($timezone = 'server') {
    275275        global $cache_lastcommentmodified, $wpdb;
    276276
    277277        if ( isset($cache_lastcommentmodified[$timezone]) )
     
    416416        do_action( 'check_comment_flood', $comment_author_IP, $comment_author_email, $comment_date_gmt );
    417417
    418418        if ( $user_id ) {
    419                 $userdata = get_userdata($user_id);
     419                $userdata = get_user_data($user_id);
    420420                $user = new WP_User($user_id);
    421421                $post_author = $wpdb->get_var($wpdb->prepare("SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1", $comment_post_ID));
    422422        }
     
    15271527        // when set to true, this outputs debug messages by itself
    15281528        $client->debug = false;
    15291529        $home = trailingslashit( get_option('home') );
    1530         if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
     1530        if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_blog_info('rss2_url') ) ) // then try a normal ping
    15311531                $client->query('weblogUpdates.ping', get_option('blogname'), $home);
    15321532}
    15331533
  • wp-includes/feed-rss.php

     
    1616        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
    1717        <link><?php bloginfo_rss('url') ?></link>
    1818        <description><?php bloginfo_rss('description') ?></description>
    19         <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
     19        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_last_post_modified('GMT'), false); ?></lastBuildDate>
    2020        <docs>http://backend.userland.com/rss092</docs>
    2121        <language><?php echo get_option('rss_language'); ?></language>
    2222        <?php do_action('rss_head'); ?>
  • wp-includes/functions.php

     
    207207/**
    208208 * Get the week start and end from the datetime or date string from mysql.
    209209 *
    210  * @since 0.71
     210 * @since 2.8
    211211 *
    212212 * @param string $mysqlstring Date or datetime field type from mysql.
    213213 * @param int $start_of_week Optional. Start of the week as an integer.
    214214 * @return array Keys are 'start' and 'end'.
    215215 */
    216 function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
     216function get_week_start_end( $mysqlstring, $start_of_week = '' ) {
    217217        $my = substr( $mysqlstring, 0, 4 ); // Mysql string Year
    218218        $mm = substr( $mysqlstring, 8, 2 ); // Mysql string Month
    219219        $md = substr( $mysqlstring, 5, 2 ); // Mysql string day
     
    428428 *
    429429 * it is called.
    430430 *
    431  * @since 1.0.0
     431 * @since 2.8
    432432 * @package WordPress
    433433 * @subpackage Option
    434434 * @uses apply_filters() Calls 'pre_option_$optionname' hook with option value as parameter.
     
    436436 *
    437437 * @return array List of all options.
    438438 */
    439 function get_alloptions() {
     439function get_all_options() {
    440440        global $wpdb;
    441441        $show = $wpdb->hide_errors();
    442442        if ( !$options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
     
    457457/**
    458458 * Loads and caches all autoloaded options, if available or all options.
    459459 *
    460  * This is different from get_alloptions(), in that this function will cache the
     460 * This is different from get_all_options(), in that this function will cache the
    461461 * options and will return the cached options when called again.
    462462 *
    463463 * @since 2.2.0
     
    788788        if ( ! $user = wp_get_current_user() )
    789789                return;
    790790
    791         delete_usermeta( $user->ID, 'user-settings' );
     791        delete_user_meta( $user->ID, 'user-settings' );
    792792        setcookie('wp-settings-'.$user->ID, ' ', time() - 31536000, SITECOOKIEPATH);
    793793}
    794794
     
    14171417 */
    14181418function cache_javascript_headers() {
    14191419        $expiresOffset = 864000; // 10 days
    1420         header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
     1420        header( "Content-Type: text/javascript; charset=" . get_blog_info( 'charset' ) );
    14211421        header( "Vary: Accept-Encoding" ); // Handle proxies
    14221422        header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
    14231423}
     
    21282128                $trans['update']['attachment'] = array( __( 'Your attempt to edit this attachment: &quot;%s&quot; has failed.' ), 'get_the_title' );
    21292129
    21302130                $trans['add']['category']      = array( __( 'Your attempt to add this category has failed.' ), false );
    2131                 $trans['delete']['category']   = array( __( 'Your attempt to delete this category: &quot;%s&quot; has failed.' ), 'get_catname' );
    2132                 $trans['update']['category']   = array( __( 'Your attempt to edit this category: &quot;%s&quot; has failed.' ), 'get_catname' );
     2131                $trans['delete']['category']   = array( __( 'Your attempt to delete this category: &quot;%s&quot; has failed.' ), 'get_cat_name' );
     2132                $trans['update']['category']   = array( __( 'Your attempt to edit this category: &quot;%s&quot; has failed.' ), 'get_cat_name' );
    21332133
    21342134                $trans['delete']['comment']    = array( __( 'Your attempt to delete this comment: &quot;%s&quot; has failed.' ), 'use_id' );
    21352135                $trans['unapprove']['comment'] = array( __( 'Your attempt to unapprove this comment: &quot;%s&quot; has failed.' ), 'use_id' );
     
    21682168                $trans['edit']['theme']        = array( __( 'Your attempt to edit this theme file: &quot;%s&quot; has failed.' ), 'use_id' );
    21692169                $trans['switch']['theme']      = array( __( 'Your attempt to switch to this theme: &quot;%s&quot; has failed.' ), 'use_id' );
    21702170
    2171                 $trans['log']['out']           = array( sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'sitename' ) ), false );
     2171                $trans['log']['out']           = array( sprintf( __( 'You are attempting to log out of %s' ), get_blog_info( 'sitename' ) ), false );
    21722172
    21732173                if ( isset( $trans[$verb][$noun] ) ) {
    21742174                        if ( !empty( $trans[$verb][$noun][1] ) ) {
     
    22542254
    22552255        if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL )
    22562256                $admin_dir = WP_SITEURL . '/wp-admin/';
    2257         elseif ( function_exists( 'get_bloginfo' ) && '' != get_bloginfo( 'wpurl' ) )
    2258                 $admin_dir = get_bloginfo( 'wpurl' ) . '/wp-admin/';
     2257        elseif ( function_exists( 'get_blog_info' ) && '' != get_blog_info( 'wpurl' ) )
     2258                $admin_dir = get_blog_info( 'wpurl' ) . '/wp-admin/';
    22592259        elseif ( strpos( $_SERVER['PHP_SELF'], 'wp-admin' ) !== false )
    22602260                $admin_dir = '';
    22612261        else
  • wp-includes/registration.php

     
    1414 * @return null|int The user's ID on success, and null on failure.
    1515 */
    1616function username_exists( $username ) {
    17         if ( $user = get_userdatabylogin( $username ) ) {
     17        if ( $user = get_user_data_by_login( $username ) ) {
    1818                return $user->ID;
    1919        } else {
    2020                return null;
     
    109109        if ( !empty($ID) ) {
    110110                $ID = (int) $ID;
    111111                $update = true;
    112                 $old_user_data = get_userdata($ID);
     112                $old_user_data = get_user_data($ID);
    113113        } else {
    114114                $update = false;
    115115                // Hash the password
     
    187187                $user_id = (int) $wpdb->insert_id;
    188188        }
    189189
    190         update_usermeta( $user_id, 'first_name', $first_name);
    191         update_usermeta( $user_id, 'last_name', $last_name);
    192         update_usermeta( $user_id, 'nickname', $nickname );
    193         update_usermeta( $user_id, 'description', $description );
    194         update_usermeta( $user_id, 'jabber', $jabber );
    195         update_usermeta( $user_id, 'aim', $aim );
    196         update_usermeta( $user_id, 'yim', $yim );
    197         update_usermeta( $user_id, 'rich_editing', $rich_editing);
    198         update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
    199         update_usermeta( $user_id, 'admin_color', $admin_color);
    200         update_usermeta( $user_id, 'use_ssl', $use_ssl);
     190        update_user_meta( $user_id, 'first_name', $first_name);
     191        update_user_meta( $user_id, 'last_name', $last_name);
     192        update_user_meta( $user_id, 'nickname', $nickname );
     193        update_user_meta( $user_id, 'description', $description );
     194        update_user_meta( $user_id, 'jabber', $jabber );
     195        update_user_meta( $user_id, 'aim', $aim );
     196        update_user_meta( $user_id, 'yim', $yim );
     197        update_user_meta( $user_id, 'rich_editing', $rich_editing);
     198        update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts);
     199        update_user_meta( $user_id, 'admin_color', $admin_color);
     200        update_user_meta( $user_id, 'use_ssl', $use_ssl);
    201201
    202202        if ( $update && isset($role) ) {
    203203                $user = new WP_User($user_id);
     
    243243        $ID = (int) $userdata['ID'];
    244244
    245245        // First, get all of the original fields
    246         $user = get_userdata($ID);
     246        $user = get_user_data($ID);
    247247
    248248        // Escape data pulled from DB.
    249249        $user = add_magic_quotes(get_object_vars($user));
  • wp-includes/comment-template.php

     
    2323        global $comment;
    2424        if ( empty($comment->comment_author) ) {
    2525                if (!empty($comment->user_id)){
    26                         $user=get_userdata($comment->user_id);
     26                        $user=get_user_data($comment->user_id);
    2727                        $author=$user->user_login;
    2828                } else {
    2929                        $author = __('Anonymous');
     
    290290        $classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
    291291
    292292        // If the comment author has an id (registered), then print the log in name
    293         if ( $comment->user_id > 0 && $user = get_userdata($comment->user_id) ) {
     293        if ( $comment->user_id > 0 && $user = get_user_data($comment->user_id) ) {
    294294                // For all registered users, 'byuser'
    295295                $classes[] = 'byuser comment-author-' . $user->user_nicename;
    296296                // For comment authors who are the author of the post
  • wp-includes/feed-rdf.php

     
    2323        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
    2424        <link><?php bloginfo_rss('url') ?></link>
    2525        <description><?php bloginfo_rss('description') ?></description>
    26         <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date>
     26        <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_post_modified('GMT'), false); ?></dc:date>
    2727        <?php the_generator( 'rdf' ); ?>
    2828        <sy:updatePeriod>hourly</sy:updatePeriod>
    2929        <sy:updateFrequency>1</sy:updateFrequency>
  • wp-includes/user.php

     
    114114/**
    115115 * Number of posts user has written.
    116116 *
    117  * @since 0.71
     117 * @since 2.8
    118118 * @uses $wpdb WordPress database object for queries.
    119119 *
    120120 * @param int $userid User ID.
    121121 * @return int Amount of posts user has written.
    122122 */
    123 function get_usernumposts($userid) {
     123function get_user_num_posts($userid) {
    124124        global $wpdb;
    125125        $userid = (int) $userid;
    126126        $count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(*) FROM $wpdb->posts WHERE post_author = %d AND post_type = 'post' AND ", $userid) . get_private_posts_cap_sql('post'));
     
    178178        if ( empty($user) )
    179179                $user = wp_get_current_user();
    180180        else
    181                 $user = get_userdata($user);
     181                $user = get_user_data($user);
    182182
    183183        if ( isset( $user->{$wpdb->prefix . $option} ) ) // Blog specific
    184184                $result = $user->{$wpdb->prefix . $option};
     
    212212        global $wpdb;
    213213        if ( !$global )
    214214                $option_name = $wpdb->prefix . $option_name;
    215         return update_usermeta( $user_id, $option_name, $newvalue );
     215        return update_user_meta( $user_id, $option_name, $newvalue );
    216216}
    217217
    218218/**
     
    243243/**
    244244 * Remove user meta data.
    245245 *
    246  * @since 2.0.0
     246 * @since 2.8
    247247 * @uses $wpdb WordPress database object for queries.
    248248 *
    249249 * @param int $user_id User ID.
     
    251251 * @param mixed $meta_value Metadata value.
    252252 * @return bool True deletion completed and false if user_id is not a number.
    253253 */
    254 function delete_usermeta( $user_id, $meta_key, $meta_value = '' ) {
     254function delete_user_meta( $user_id, $meta_key, $meta_value = '' ) {
    255255        global $wpdb;
    256256        if ( !is_numeric( $user_id ) )
    257257                return false;
     
    279279 * one item to be returned, which be that single item type. If there is more
    280280 * than one metadata value, then it will be list of metadata values.
    281281 *
    282  * @since 2.0.0
     282 * @since 2.8
    283283 * @uses $wpdb WordPress database object for queries.
    284284 *
    285285 * @param int $user_id User ID
    286286 * @param string $meta_key Optional. Metadata key.
    287287 * @return mixed
    288288 */
    289 function get_usermeta( $user_id, $meta_key = '') {
     289function get_user_meta( $user_id, $meta_key = '') {
    290290        global $wpdb;
    291291        $user_id = (int) $user_id;
    292292
     
    329329 *
    330330 * Will remove the metadata, if the meta value is empty.
    331331 *
    332  * @since 2.0.0
     332 * @since 2.8
    333333 * @uses $wpdb WordPress database object for queries
    334334 *
    335335 * @param int $user_id User ID
     
    337337 * @param mixed $meta_value Metadata value.
    338338 * @return bool True on successful update, false on failure.
    339339 */
    340 function update_usermeta( $user_id, $meta_key, $meta_value ) {
     340function update_user_meta( $user_id, $meta_key, $meta_value ) {
    341341        global $wpdb;
    342342        if ( !is_numeric( $user_id ) )
    343343                return false;
     
    349349        $meta_value = maybe_serialize($meta_value);
    350350
    351351        if (empty($meta_value)) {
    352                 return delete_usermeta($user_id, $meta_key);
     352                return delete_user_meta($user_id, $meta_key);
    353353        }
    354354
    355355        $cur = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
  • wp-includes/feed-atom-comments.php

     
    1818                if ( is_singular() )
    1919                        printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
    2020                elseif ( is_search() )
    21                         printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_bloginfo_rss( 'name' ), attribute_escape(get_search_query()));
     21                        printf(ent2ncr(__('Comments for %1$s searching on %2$s')), get_blog_info_rss( 'name' ), attribute_escape(get_search_query()));
    2222                else
    23                         printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
     23                        printf(ent2ncr(__('Comments for %s')), get_blog_info_rss( 'name' ) . get_wp_title_rss());
    2424        ?></title>
    2525        <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
    2626
    27         <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT')); ?></updated>
     27        <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_last_comment_modified('GMT')); ?></updated>
    2828        <?php the_generator( 'atom' ); ?>
    2929
    3030<?php if ( is_singular() ) { ?>
  • wp-includes/query.php

     
    25552555                        $this->queried_object_id = (int) $this->post->ID;
    25562556                } else if ($this->is_author) {
    25572557                        $author_id = (int) $this->get('author');
    2558                         $author = get_userdata($author_id);
     2558                        $author = get_user_data($author_id);
    25592559                        $this->queried_object = $author;
    25602560                        $this->queried_object_id = $author_id;
    25612561                }
     
    26542654
    26552655        $id = (int) $post->ID;
    26562656
    2657         $authordata = get_userdata($post->post_author);
     2657        $authordata = get_user_data($post->post_author);
    26582658
    26592659        $day = mysql2date('d.m.y', $post->post_date);
    26602660        $currentmonth = mysql2date('m', $post->post_date);
  • wp-includes/link-template.php

     
    128128
    129129                $author = '';
    130130                if ( strpos($permalink, '%author%') !== false ) {
    131                         $authordata = get_userdata($post->post_author);
     131                        $authordata = get_user_data($post->post_author);
    132132                        $author = $authordata->user_nicename;
    133133                }
    134134
     
    264264        }
    265265
    266266        if (! $link ) {
    267                 $link = get_bloginfo('url') . "/?attachment_id=$id";
     267                $link = get_blog_info('url') . "/?attachment_id=$id";
    268268        }
    269269
    270270        return apply_filters('attachment_link', $link, $id);
     
    995995        $request = preg_replace('|^/+|', '', $request);
    996996
    997997        if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
    998                 $base = trailingslashit( get_bloginfo( 'home' ) );
     998                $base = trailingslashit( get_blog_info( 'home' ) );
    999999
    10001000                if ( $pagenum > 1 ) {
    10011001                        $result = add_query_arg( 'paged', $pagenum, $base . $request );
     
    10171017                $request = preg_replace( '|^index\.php|', '', $request);
    10181018                $request = ltrim($request, '/');
    10191019
    1020                 $base = trailingslashit( get_bloginfo( 'url' ) );
     1020                $base = trailingslashit( get_blog_info( 'url' ) );
    10211021
    10221022                if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
    10231023                        $base .= 'index.php/';
     
    12111211/**
    12121212 * Retrieve page numbers links.
    12131213 *
    1214  * @since 2.7.0
     1214 * @since 2.8
    12151215 *
    12161216 * @param int $pagenum Optional. Page number.
    12171217 * @return string
    12181218 */
    1219 function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
     1219function get_comments_page_num_link( $pagenum = 1, $max_page = 0 ) {
    12201220        global $post, $wp_rewrite;
    12211221
    12221222        $pagenum = (int) $pagenum;
     
    12751275        if ( empty($label) )
    12761276                $label = __('Newer Comments &raquo;');
    12771277
    1278         return '<a href="' . clean_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
     1278        return '<a href="' . clean_url( get_comments_page_num_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
    12791279}
    12801280
    12811281/**
     
    13121312        if ( empty($label) )
    13131313                $label = __('&laquo; Older Comments');
    13141314
    1315         return '<a href="' . clean_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
     1315        return '<a href="' . clean_url( get_comments_page_num_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
    13161316}
    13171317
    13181318/**
  • wp-includes/author-template.php

     
    354354 *
    355355 * @since 1.5
    356356 * @uses $post The current post in the Loop's DB object.
    357  * @uses get_usernumposts()
     357 * @uses get_user_num_posts()
    358358 * @return int The number of posts by the author.
    359359 */
    360360function get_the_author_posts() {
    361361        global $post;
    362         return get_usernumposts($post->post_author);
     362        return get_user_num_posts($post->post_author);
    363363}
    364364
    365365/**
     
    414414                $link = $file . '?author=' . $auth_ID;
    415415        } else {
    416416                if ( '' == $author_nicename ) {
    417                         $user = get_userdata($author_id);
     417                        $user = get_user_data($author_id);
    418418                        if ( !empty($user->user_nicename) )
    419419                                $author_nicename = $user->user_nicename;
    420420                }
     
    435435 * @return string The author's display name.
    436436 */
    437437function get_author_name( $auth_id ) {
    438         $authordata = get_userdata( $auth_id );
     438        $authordata = get_user_data( $auth_id );
    439439        return $authordata->display_name;
    440440}
    441441
     
    480480        }
    481481
    482482        foreach ( (array) $authors as $author ) {
    483                 $author = get_userdata( $author->ID );
     483                $author = get_user_data( $author->ID );
    484484                $posts = (isset($author_count[$author->ID])) ? $author_count[$author->ID] : 0;
    485485                $name = $author->display_name;
    486486
  • wp-includes/feed-rss2-comments.php

     
    2020                if ( is_singular() )
    2121                        printf(ent2ncr(__('Comments on: %s')), get_the_title_rss());
    2222                elseif ( is_search() )
    23                         printf(ent2ncr(__('Comments for %s searching on %s')), get_bloginfo_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
     23                        printf(ent2ncr(__('Comments for %s searching on %s')), get_blog_info_rss( 'name' ), attribute_escape($wp_query->query_vars['s']));
    2424                else
    25                         printf(ent2ncr(__('Comments for %s')), get_bloginfo_rss( 'name' ) . get_wp_title_rss());
     25                        printf(ent2ncr(__('Comments for %s')), get_blog_info_rss( 'name' ) . get_wp_title_rss());
    2626        ?></title>
    2727        <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
    2828        <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
  • wp-includes/general-template.php

     
    214214/**
    215215 * Display information about the blog.
    216216 *
    217  * @see get_bloginfo() For possible values for the parameter.
     217 * @see get_blog_info() For possible values for the parameter.
    218218 * @since 0.71
    219219 *
    220220 * @param string $show What to display.
    221221 */
    222222function bloginfo($show='') {
    223         echo get_bloginfo($show, 'display');
     223        echo get_blog_info($show, 'display');
    224224}
    225225
    226226/**
     
    246246 * There are many other options and you should check the function contents:
    247247 * {@source 32 37}
    248248 *
    249  * @since 0.71
     249 * @since 2.8
    250250 *
    251251 * @param string $show Blog info to retrieve.
    252252 * @param string $filter How to filter what is retrieved.
    253253 * @return string Mostly string values, might be empty.
    254254 */
    255 function get_bloginfo($show = '', $filter = 'raw') {
     255function get_blog_info($show = '', $filter = 'raw') {
    256256
    257257        switch($show) {
    258258                case 'url' :
     
    407407
    408408        // If there's an author
    409409        if ( !empty($author) ) {
    410                 $title = get_userdata($author);
     410                $title = get_user_data($author);
    411411                $title = $title->display_name;
    412412        }
    413413        if ( !empty($author_name) ) {
     
    832832                                        if ( $arcresult->week != $arc_w_last ) {
    833833                                                $arc_year = $arcresult->yr;
    834834                                                $arc_w_last = $arcresult->week;
    835                                                 $arc_week = get_weekstartend($arcresult->yyyymmdd, get_option('start_of_week'));
     835                                                $arc_week = get_week_start_end($arcresult->yyyymmdd, get_option('start_of_week'));
    836836                                                $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']);
    837837                                                $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']);
    838838                                                $url  = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', get_option('home'), '', '?', '=', $arc_year, '&amp;', '=', $arcresult->week);
     
    13751375 * @since 2.0.0
    13761376 */
    13771377function rsd_link() {
    1378         echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_bloginfo('wpurl') . "/xmlrpc.php?rsd\" />\n";
     1378        echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . get_blog_info('wpurl') . "/xmlrpc.php?rsd\" />\n";
    13791379}
    13801380
    13811381/**
     
    13861386 */
    13871387function wlwmanifest_link() {
    13881388        echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="'
    1389                 . get_bloginfo('wpurl') . '/wp-includes/wlwmanifest.xml" /> ' . "\n";
     1389                . get_blog_info('wpurl') . '/wp-includes/wlwmanifest.xml" /> ' . "\n";
    13901390}
    13911391
    13921392/**
     
    15931593        $attributes = array();
    15941594        $output = '';
    15951595
    1596         if ( $dir = get_bloginfo('text_direction') )
     1596        if ( $dir = get_blog_info('text_direction') )
    15971597                $attributes[] = "dir=\"$dir\"";
    15981598
    1599         if ( $lang = get_bloginfo('language') ) {
     1599        if ( $lang = get_blog_info('language') ) {
    16001600                if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
    16011601                        $attributes[] = "lang=\"$lang\"";
    16021602
     
    17791779        } else {
    17801780                $_file = admin_url("$file.css");
    17811781        }
    1782         $_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
     1782        $_file = add_query_arg( 'version', get_blog_info( 'version' ),  $_file );
    17831783
    17841784        return apply_filters( 'wp_admin_css_uri', $_file, $file );
    17851785}
     
    18221822        }
    18231823
    18241824        echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
    1825         if ( 'rtl' == get_bloginfo( 'text_direction' ) )
     1825        if ( 'rtl' == get_blog_info( 'text_direction' ) )
    18261826                echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . clean_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
    18271827}
    18281828
     
    18801880function get_the_generator( $type ) {
    18811881        switch ($type) {
    18821882                case 'html':
    1883                         $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">' . "\n";
     1883                        $gen = '<meta name="generator" content="WordPress ' . get_blog_info( 'version' ) . '">' . "\n";
    18841884                        break;
    18851885                case 'xhtml':
    1886                         $gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />' . "\n";
     1886                        $gen = '<meta name="generator" content="WordPress ' . get_blog_info( 'version' ) . '" />' . "\n";
    18871887                        break;
    18881888                case 'atom':
    1889                         $gen = '<generator uri="http://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
     1889                        $gen = '<generator uri="http://wordpress.org/" version="' . get_blog_info_rss( 'version' ) . '">WordPress</generator>';
    18901890                        break;
    18911891                case 'rss2':
    1892                         $gen = '<generator>http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
     1892                        $gen = '<generator>http://wordpress.org/?v=' . get_blog_info_rss( 'version' ) . '</generator>';
    18931893                        break;
    18941894                case 'rdf':
    1895                         $gen = '<admin:generatorAgent rdf:resource="http://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
     1895                        $gen = '<admin:generatorAgent rdf:resource="http://wordpress.org/?v=' . get_blog_info_rss( 'version' ) . '" />';
    18961896                        break;
    18971897                case 'comment':
    1898                         $gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
     1898                        $gen = '<!-- generator="WordPress/' . get_blog_info( 'version' ) . '" -->';
    18991899                        break;
    19001900                case 'export':
    1901                         $gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '"-->';
     1901                        $gen = '<!-- generator="WordPress/' . get_blog_info_rss('version') . '" created="'. date('Y-m-d H:i') . '"-->';
    19021902                        break;
    19031903        }
    19041904        return apply_filters( "get_the_generator_{$type}", $gen, $type );
  • wp-includes/canonical.php

     
    123123                        if ( $redirect_url = get_category_link(get_query_var('cat')) )
    124124                                $redirect['query'] = remove_query_arg('cat', $redirect['query']);
    125125                } elseif ( is_author() && !empty($_GET['author']) ) {
    126                         $author = get_userdata(get_query_var('author'));
     126                        $author = get_user_data(get_query_var('author'));
    127127                        if ( false !== $author && $redirect_url = get_author_posts_url($author->ID, $author->user_nicename) )
    128128                                $redirect['query'] = remove_query_arg('author', $redirect['author']);
    129129                }
  • wp-includes/capabilities.php

     
    473473                }
    474474
    475475                if ( ! empty( $id ) )
    476                         $this->data = get_userdata( $id );
     476                        $this->data = get_user_data( $id );
    477477                else
    478                         $this->data = get_userdatabylogin( $name );
     478                        $this->data = get_user_data_by_login( $name );
    479479
    480480                if ( empty( $this->data->ID ) )
    481481                        return;
     
    551551         */
    552552        function add_role( $role ) {
    553553                $this->caps[$role] = true;
    554                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
     554                update_user_meta( $this->ID, $this->cap_key, $this->caps );
    555555                $this->get_role_caps();
    556556                $this->update_user_level_from_caps();
    557557        }
     
    568568                if ( empty( $this->roles[$role] ) || ( count( $this->roles ) <= 1 ) )
    569569                        return;
    570570                unset( $this->caps[$role] );
    571                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
     571                update_user_meta( $this->ID, $this->cap_key, $this->caps );
    572572                $this->get_role_caps();
    573573        }
    574574
     
    593593                } else {
    594594                        $this->roles = false;
    595595                }
    596                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
     596                update_user_meta( $this->ID, $this->cap_key, $this->caps );
    597597                $this->get_role_caps();
    598598                $this->update_user_level_from_caps();
    599599        }
     
    639639        function update_user_level_from_caps() {
    640640                global $wpdb;
    641641                $this->user_level = array_reduce( array_keys( $this->allcaps ), array( &$this, 'level_reduction' ), 0 );
    642                 update_usermeta( $this->ID, $wpdb->prefix.'user_level', $this->user_level );
     642                update_user_meta( $this->ID, $wpdb->prefix.'user_level', $this->user_level );
    643643        }
    644644
    645645        /**
     
    653653         */
    654654        function add_cap( $cap, $grant = true ) {
    655655                $this->caps[$cap] = $grant;
    656                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
     656                update_user_meta( $this->ID, $this->cap_key, $this->caps );
    657657        }
    658658
    659659        /**
     
    667667        function remove_cap( $cap ) {
    668668                if ( empty( $this->caps[$cap] ) ) return;
    669669                unset( $this->caps[$cap] );
    670                 update_usermeta( $this->ID, $this->cap_key, $this->caps );
     670                update_user_meta( $this->ID, $this->cap_key, $this->caps );
    671671        }
    672672
    673673        /**
     
    679679        function remove_all_caps() {
    680680                global $wpdb;
    681681                $this->caps = array();
    682                 update_usermeta( $this->ID, $this->cap_key, '' );
    683                 update_usermeta( $this->ID, $wpdb->prefix.'user_level', '' );
     682                update_user_meta( $this->ID, $this->cap_key, '' );
     683                update_user_meta( $this->ID, $wpdb->prefix.'user_level', '' );
    684684                $this->get_role_caps();
    685685        }
    686686
     
    761761                }
    762762                break;
    763763        case 'delete_post':
    764                 $author_data = get_userdata( $user_id );
     764                $author_data = get_user_data( $user_id );
    765765                //echo "post ID: {$args[0]}<br />";
    766766                $post = get_post( $args[0] );
    767767                if ( 'page' == $post->post_type ) {
    768768                        $args = array_merge( array( 'delete_page', $user_id ), $args );
    769769                        return call_user_func_array( 'map_meta_cap', $args );
    770770                }
    771                 $post_author_data = get_userdata( $post->post_author );
     771                $post_author_data = get_user_data( $post->post_author );
    772772                //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
    773773                // If the user is the author...
    774774                if ( $user_id == $post_author_data->ID ) {
     
    789789                }
    790790                break;
    791791        case 'delete_page':
    792                 $author_data = get_userdata( $user_id );
     792                $author_data = get_user_data( $user_id );
    793793                //echo "post ID: {$args[0]}<br />";
    794794                $page = get_page( $args[0] );
    795                 $page_author_data = get_userdata( $page->post_author );
     795                $page_author_data = get_user_data( $page->post_author );
    796796                //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
    797797                // If the user is the author...
    798798                if ( $user_id == $page_author_data->ID ) {
     
    815815                // edit_post breaks down to edit_posts, edit_published_posts, or
    816816                // edit_others_posts
    817817        case 'edit_post':
    818                 $author_data = get_userdata( $user_id );
     818                $author_data = get_user_data( $user_id );
    819819                //echo "post ID: {$args[0]}<br />";
    820820                $post = get_post( $args[0] );
    821821                if ( 'page' == $post->post_type ) {
    822822                        $args = array_merge( array( 'edit_page', $user_id ), $args );
    823823                        return call_user_func_array( 'map_meta_cap', $args );
    824824                }
    825                 $post_author_data = get_userdata( $post->post_author );
     825                $post_author_data = get_user_data( $post->post_author );
    826826                //echo "current user id : $user_id, post author id: " . $post_author_data->ID . "<br />";
    827827                // If the user is the author...
    828828                if ( $user_id == $post_author_data->ID ) {
     
    843843                }
    844844                break;
    845845        case 'edit_page':
    846                 $author_data = get_userdata( $user_id );
     846                $author_data = get_user_data( $user_id );
    847847                //echo "post ID: {$args[0]}<br />";
    848848                $page = get_page( $args[0] );
    849                 $page_author_data = get_userdata( $page->post_author );
     849                $page_author_data = get_user_data( $page->post_author );
    850850                //echo "current user id : $user_id, page author id: " . $page_author_data->ID . "<br />";
    851851                // If the user is the author...
    852852                if ( $user_id == $page_author_data->ID ) {
     
    878878                        break;
    879879                }
    880880
    881                 $author_data = get_userdata( $user_id );
    882                 $post_author_data = get_userdata( $post->post_author );
     881                $author_data = get_user_data( $user_id );
     882                $post_author_data = get_user_data( $post->post_author );
    883883                if ( $user_id == $post_author_data->ID )
    884884                        $caps[] = 'read';
    885885                else
     
    893893                        break;
    894894                }
    895895
    896                 $author_data = get_userdata( $user_id );
    897                 $page_author_data = get_userdata( $page->post_author );
     896                $author_data = get_user_data( $user_id );
     897                $page_author_data = get_user_data( $page->post_author );
    898898                if ( $user_id == $page_author_data->ID )
    899899                        $caps[] = 'read';
    900900                else
  • wp-includes/classes.php

     
    302302         * @since 2.0.0
    303303         */
    304304        function send_headers() {
    305                 @header('X-Pingback: '. get_bloginfo('pingback_url'));
     305                @header('X-Pingback: '. get_blog_info('pingback_url'));
    306306                if ( is_user_logged_in() )
    307307                        nocache_headers();
    308308                if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
     
    325325                                        )
    326326                                )
    327327                        )
    328                                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastcommentmodified('GMT'), 0).' GMT';
     328                                $wp_last_modified = mysql2date('D, d M Y H:i:s', get_last_comment_modified('GMT'), 0).' GMT';
    329329                        else
    330                                 $wp_last_modified = mysql2date('D, d M Y H:i:s', get_lastpostmodified('GMT'), 0).' GMT';
     330                                $wp_last_modified = mysql2date('D, d M Y H:i:s', get_last_post_modified('GMT'), 0).' GMT';
    331331                        $wp_etag = '"' . md5($wp_last_modified) . '"';
    332332                        @header("Last-Modified: $wp_last_modified");
    333333                        @header("ETag: $wp_etag");