Changeset 15843
- Timestamp:
- 10/19/2010 07:48:22 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 34 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin.php
r15746 r15843 216 216 } else { 217 217 do_action("load-$pagenow"); 218 // Backwards compatibility with old load-page-new.php, load-page.php, 219 // and load-categories.php actions. 220 if ( $typenow == 'page' ) { 221 if ( $pagenow == 'post-new.php' ) 222 do_action( 'load-page-new.php' ); 223 elseif ( $pagenow == 'post.php' ) 224 do_action( 'load-page.php' ); 218 // Backwards compatibility with old load-page-new.php, load-page.php, 219 // and load-categories.php actions. 220 if ( $typenow == 'page' ) { 221 if ( $pagenow == 'post-new.php' ) 222 do_action( 'load-page-new.php' ); 223 elseif ( $pagenow == 'post.php' ) 224 do_action( 'load-page.php' ); 225 225 } elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) { 226 226 do_action( 'load-categories.php' ); -
trunk/wp-admin/css/nav-menu.dev.css
r15588 r15843 96 96 font-weight:bold; 97 97 } 98 98 99 99 #nav-menu-footer { 100 100 border-width: 0 1px 1px 1px; -
trunk/wp-admin/custom-header.php
r15830 r15843 559 559 </table> 560 560 <?php endif; 561 562 do_action( 'custom_header_options' ); 561 562 do_action( 'custom_header_options' ); 563 563 564 564 wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> … … 645 645 <input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" /> 646 646 <?php wp_nonce_field( 'custom-header-crop-image' ) ?> 647 647 648 648 <?php submit_button( __( 'Crop and Publish' ) ); ?> 649 649 </p> -
trunk/wp-admin/includes/bookmark.php
r15564 r15843 121 121 122 122 /** 123 * This function inserts/updates links into/in the database. 123 * This function inserts/updates links into/in the database. 124 124 * 125 125 * @since 2.0.0 … … 222 222 * 223 223 * @param int $link_id ID of link to update 224 * @param array $link_categories Array of categories to 224 * @param array $link_categories Array of categories to 225 225 */ 226 226 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) { -
trunk/wp-admin/includes/default-list-tables.php
r15842 r15843 86 86 87 87 $per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' ); 88 $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 88 $per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 89 89 90 90 if ( $this->hierarchical_display ) … … 162 162 $status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>'; 163 163 } 164 164 165 165 return $status_links; 166 166 } … … 736 736 737 737 if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) : 738 $users_opt = array( 739 'name' => 'post_author', 740 'class'=> 'authors', 741 'multi' => 1, 742 'echo' => 0 738 $users_opt = array( 739 'name' => 'post_author', 740 'class'=> 'authors', 741 'multi' => 1, 742 'echo' => 0 743 743 ); 744 744 if ( $bulk ) … … 999 999 if ( !current_user_can('upload_files') ) 1000 1000 wp_die( __( 'You do not have permission to upload files.' ) ); 1001 } 1001 } 1002 1002 1003 1003 function prepare_items() { … … 1489 1489 1490 1490 $this->callback_args = $args; 1491 1491 1492 1492 $this->set_pagination_args( array( 1493 1493 'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ), 1494 'per_page' => $tags_per_page, 1494 'per_page' => $tags_per_page, 1495 1495 ) ); 1496 1496 } … … 1678 1678 return $out; 1679 1679 } 1680 1680 1681 1681 function column_description( $tag ) { 1682 1682 return $tag->description; … … 1712 1712 function column_default( $tag, $column_name ) { 1713 1713 global $taxonomy; 1714 1714 1715 1715 return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id ); 1716 1716 $out .= "</td>"; … … 1821 1821 1822 1822 $this->items = $wp_user_search->get_results(); 1823 1823 1824 1824 $this->set_pagination_args( array( 1825 1825 'total_items' => $wp_user_search->get_total(), 1826 'per_page' => $users_per_page, 1826 'per_page' => $users_per_page, 1827 1827 ) ); 1828 1828 } … … 1889 1889 <?php 1890 1890 } 1891 1891 1892 1892 function current_action() { 1893 1893 if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) ) … … 2564 2564 2565 2565 $this->items = get_bookmarks( $args ); 2566 } 2566 } 2567 2567 2568 2568 function no_items() { … … 2725 2725 } 2726 2726 2727 function check_permissions() { 2727 function check_permissions() { 2728 2728 if ( ! current_user_can( 'manage_sites' ) ) 2729 2729 wp_die( __( 'You do not have permission to access this page.' ) ); … … 3015 3015 if ( !is_multisite() ) 3016 3016 wp_die( __( 'Multisite support is not enabled.' ) ); 3017 3017 3018 3018 if ( ! current_user_can( 'manage_network_users' ) ) 3019 3019 wp_die( __( 'You do not have permission to access this page.' ) ); … … 3046 3046 3047 3047 $this->items = $wp_user_search->get_results(); 3048 3048 3049 3049 $this->set_pagination_args( array( 3050 3050 'total_items' => $wp_user_search->get_total(), 3051 'per_page' => $users_per_page, 3051 'per_page' => $users_per_page, 3052 3052 ) ); 3053 3053 } … … 3368 3368 uasort( $this->items, '_order_plugins_callback' ); 3369 3369 } 3370 3370 3371 3371 $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 ); 3372 3372 … … 3417 3417 function get_views() { 3418 3418 global $totals, $status; 3419 3419 3420 3420 $status_links = array(); 3421 3421 foreach ( $totals as $type => $count ) { … … 3453 3453 } 3454 3454 3455 $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>", 3455 $status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>", 3456 3456 add_query_arg('plugin_status', $type, 'plugins.php'), 3457 3457 ( $type == $status ) ? ' class="current"' : '', … … 3641 3641 function check_permissions() { 3642 3642 if ( ! current_user_can('install_plugins') ) 3643 wp_die(__('You do not have sufficient permissions to install plugins on this site.')); 3643 wp_die(__('You do not have sufficient permissions to install plugins on this site.')); 3644 3644 } 3645 3645 … … 4082 4082 include( ABSPATH . 'wp-admin/includes/theme-install.php' ); 4083 4083 4084 global $tabs, $tab, $paged, $type, $term, $theme_field_defaults; 4085 4084 global $tabs, $tab, $paged, $type, $term, $theme_field_defaults; 4085 4086 4086 wp_reset_vars( array( 'tab' ) ); 4087 4087 -
trunk/wp-admin/includes/list-table.php
r15764 r15843 262 262 if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] ) 263 263 return $_REQUEST['action2']; 264 264 265 265 return false; 266 266 } … … 399 399 function get_pagenum( $query_var = 'paged' ) { 400 400 $pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0; 401 401 402 402 return max( 1, $pagenum ); 403 403 } … … 410 410 * 411 411 * @return int 412 */ 412 */ 413 413 function get_items_per_page( $option, $default = 20 ) { 414 414 $per_page = (int) get_user_option( $option ); … … 622 622 * 623 623 * @return array 624 */ 624 */ 625 625 function get_table_classes() { 626 626 extract( $this->_args ); -
trunk/wp-admin/includes/meta-boxes.php
r15742 r15843 509 509 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label> 510 510 <?php 511 wp_dropdown_users( array( 512 'name' => 'post_author_override', 511 wp_dropdown_users( array( 512 'name' => 'post_author_override', 513 513 'selected' => empty($post->ID) ? $user_ID : $post->post_author 514 514 ) ); -
trunk/wp-admin/includes/template.php
r15830 r15843 2073 2073 $current_screen->is_network = is_network_admin() ? true : false; 2074 2074 $current_screen->is_user = is_user_admin() ? true : false; 2075 2075 2076 2076 if ( $current_screen->is_network ) { 2077 2077 $current_screen->base .= '-network'; -
trunk/wp-admin/js/list-table.dev.js
r15530 r15843 78 78 79 79 this.fetch_list( 80 data, 80 data, 81 81 $.proxy(this, 'handle_success'), 82 82 $.proxy(this, 'handle_error') -
trunk/wp-admin/js/nav-menu.dev.js
r15709 r15843 919 919 if ( newID != matched[1] ) { 920 920 $item.html( $item.html().replace(new RegExp( 921 'menu-item\\[' + matched[1] + '\\]', 'g'), 921 'menu-item\\[' + matched[1] + '\\]', 'g'), 922 922 'menu-item[' + newID + ']' 923 923 ) ); -
trunk/wp-admin/js/theme.dev.js
r15656 r15843 48 48 opts.search = $( 'input[name=s]' ).val(); 49 49 opts.order = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random'; 50 50 51 51 $( '#availablethemes td' ).fadeTo( 500, 0.1, function() { 52 52 $( '#availablethemes td img' ).hide(); … … 56 56 }); 57 57 } 58 58 59 59 // These are the functions we expose 60 60 var api = { … … 69 69 theme_viewer = new ThemeViewer(); 70 70 theme_viewer.init(); 71 }); 71 }); -
trunk/wp-admin/network/edit.php
r15836 r15843 75 75 } 76 76 } 77 77 78 78 submit_button( __('Confirm Deletion'), 'delete' ); 79 79 ?> -
trunk/wp-admin/options-general.php
r15810 r15843 50 50 action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format', 51 51 date : format.val(), 52 }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } ); 52 }, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } ); 53 53 }); 54 54 }); -
trunk/wp-admin/themes.php
r15809 r15843 111 111 } 112 112 echo implode ( ' | ', $options ); 113 113 114 114 if ( $ct->tags ) : ?> 115 115 <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p> … … 147 147 <?php foreach ( $feature_list as $feature_name => $features ) : 148 148 $feature_name = esc_html( $feature_name ); ?> 149 149 150 150 <div class="feature-container"> 151 151 <div class="feature-name"><?php echo $feature_name ?></div> -
trunk/wp-includes/canonical.php
r15765 r15843 343 343 if ( !$redirect_url || $redirect_url == $requested_url ) 344 344 return false; 345 346 // Hex encoded octets are case-insensitive. 345 346 // Hex encoded octets are case-insensitive. 347 347 if ( false !== strpos($requested_url, '%') ) { 348 348 if ( !function_exists('lowercase_octets') ) { 349 function lowercase_octets($matches) { 350 return strtolower( $matches[0] ); 351 } 349 function lowercase_octets($matches) { 350 return strtolower( $matches[0] ); 351 } 352 352 } 353 353 $requested_url = preg_replace_callback('|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url); -
trunk/wp-includes/category-template.php
r15825 r15843 964 964 /** 965 965 * Check if the current post has any of given terms. 966 * 966 * 967 967 * The given terms are checked against the post's terms' term_ids, names and slugs. 968 968 * Terms given as integers will only be checked against the post's terms' term_ids. -
trunk/wp-includes/comment.php
r15723 r15843 312 312 wp_cache_add( $cache_key, $comments, 'comment' ); 313 313 314 return $comments; 314 return $comments; 315 315 } 316 316 } -
trunk/wp-includes/functions.php
r15842 r15843 4343 4343 * 4344 4344 * @since 3.1.0 4345 * @access private 4345 * @access private 4346 4346 * 4347 4347 * @param callback $callback function that accepts ( ID, callback_arg, ... ) and outputs parent_ID -
trunk/wp-includes/general-template.php
r15819 r15843 655 655 return; 656 656 657 657 658 658 $post_type_obj = get_post_type_object( get_query_var( 'post_type' ) ); 659 659 $title = apply_filters('post_type_archive_title', $post_type_obj->labels->name ); … … 664 664 return $title; 665 665 } 666 666 667 667 /** 668 668 * Display or retrieve page title for category archive. -
trunk/wp-includes/link-template.php
r15842 r15843 859 859 * 860 860 * @param string $post_type Post type 861 * @param string $feed Optional. Feed type 862 * @return string 863 */ 861 * @param string $feed Optional. Feed type 862 * @return string 863 */ 864 864 function get_post_type_archive_feed_link( $post_type, $feed = '' ) { 865 865 $default_feed = get_default_feed(); -
trunk/wp-includes/ms-blogs.php
r15836 r15843 117 117 * 118 118 * @since MU 119 * 119 * 120 120 * @param int|string|array $fields A blog ID, a blog name, or an array of fields to query against. 121 121 * @param bool $get_all Whether to retrieve all details or only the details in the blogs table. Default is true. … … 489 489 $wpdb->suppress_errors( false ); 490 490 } 491 491 492 492 if ( did_action('init') ) { 493 $current_user = wp_get_current_user(); 493 $current_user = wp_get_current_user(); 494 494 if ( is_object( $current_user ) ) 495 495 $current_user->for_blog( $blog_id ); … … 664 664 * 665 665 * @since MU 666 * 666 * 667 667 * @param $deprecated Not used 668 668 * @param int $start The offset -
trunk/wp-includes/ms-functions.php
r15746 r15843 125 125 * @since MU 1.1 126 126 * @uses get_blogs_of_user() 127 * 127 * 128 128 * @param int $user_id The unique ID of the user 129 129 * @param int $blog Optional. If no blog_id is provided, current site is used … … 269 269 * users are removed from a blog. 270 270 * 271 * Accepts an optional $reassign parameter, if you want to 271 * Accepts an optional $reassign parameter, if you want to 272 272 * reassign the user's blog posts to another user upon removal. 273 273 * -
trunk/wp-includes/nav-menu-template.php
r15774 r15843 197 197 198 198 unset($menu_items); 199 199 200 200 $sorted_menu_items = apply_filters( 'wp_nav_menu_objects', $sorted_menu_items, $args ); 201 201 … … 315 315 316 316 foreach ( (array) $menu_items as $key => $menu_item ) { 317 317 318 318 $menu_items[$key]->current = false; 319 319 320 320 $classes = (array) $menu_item->classes; 321 321 $classes[] = 'menu-item'; … … 363 363 $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url ); 364 364 $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) ); 365 365 366 366 if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) { 367 367 $classes[] = 'current-menu-item'; … … 384 384 $active_object = $menu_item->object; 385 385 } 386 386 387 387 if ( untrailingslashit($item_url) == home_url() ) 388 388 $classes[] = 'menu-item-home'; … … 404 404 $menu_items[$key]->current_item_ancestor = false; 405 405 $menu_items[$key]->current_item_parent = false; 406 406 407 407 if ( 408 408 isset( $parent_item->type ) && -
trunk/wp-includes/post.php
r15842 r15843 497 497 * @since 3.1.0 498 498 * @uses has_term() 499 * 499 * 500 500 * @param string $format The format to check for 501 501 * @param object|id $post The post to check. If not supplied, defaults to the current post if used in the loop. … … 3813 3813 * Checked for changed slugs for published post objects and save the old slug. 3814 3814 * 3815 * The function is used when a post object of any type is updated, 3815 * The function is used when a post object of any type is updated, 3816 3816 * by comparing the current and previous post objects. 3817 3817 * -
trunk/wp-includes/query.php
r15832 r15843 104 104 * 105 105 * If the $post_types parameter is specified, this function will additionally 106 * check if the query is for exactly one of the post types specified. If a plugin 106 * check if the query is for exactly one of the post types specified. If a plugin 107 107 * is causing multiple post types to appear in the query, specifying a post type 108 108 * will cause this check to return false. … … 136 136 return $wp_query->is_post_type_archive( $post_types ); 137 137 } 138 138 139 139 /** 140 140 * Is the query for an attachment page? … … 2649 2649 * 2650 2650 * If the $post_types parameter is specified, this function will additionally 2651 * check if the query is for exactly one of the post types specified. If a plugin 2651 * check if the query is for exactly one of the post types specified. If a plugin 2652 2652 * is causing multiple post types to appear in the query, specifying a post type 2653 2653 * will cause this check to return false. -
trunk/wp-includes/taxonomy.php
r15842 r15843 504 504 $term = $term->term_id; 505 505 else 506 continue; 506 continue; 507 507 } 508 508 $children = array_merge( $children, get_term_children( $term, $taxonomy ) ); … … 1447 1447 1448 1448 $defaults = array(); 1449 1449 1450 1450 if ( 'category' == $taxonomy ) { 1451 1451 $defaults['default'] = get_option( 'default_category' ); … … 1453 1453 return 0; // Don't delete the default category 1454 1454 } 1455 1455 1456 1456 $args = wp_parse_args($args, $defaults); 1457 1457 extract($args, EXTR_SKIP); … … 2642 2642 } 2643 2643 // Back Compat filters. 2644 if ( 'post_tag' == $taxonomy ) 2644 if ( 'post_tag' == $taxonomy ) 2645 2645 $termlink = apply_filters( 'tag_link', $termlink, $term->term_id ); 2646 2646 elseif ( 'category' == $taxonomy ) … … 2816 2816 return false; 2817 2817 } 2818 2818 2819 2819 /** 2820 2820 * Get an array of ancestor IDs for a given object. … … 2826 2826 function get_ancestors($object_id = 0, $object_type = '') { 2827 2827 $object_id = (int) $object_id; 2828 2828 2829 2829 $ancestors = array(); 2830 2830 … … 2832 2832 return apply_filters('get_ancestors', $ancestors, $object_id, $object_type); 2833 2833 } 2834 2834 2835 2835 if ( is_taxonomy_hierarchical( $object_type ) ) { 2836 2836 $term = get_term($object_id, $object_type); … … 2841 2841 } elseif ( null !== get_post_type_object( $object_type ) ) { 2842 2842 $object = get_post($object_id); 2843 if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) ) 2843 if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) ) 2844 2844 $ancestors = $object->ancestors; 2845 2845 else { -
trunk/wp-includes/theme-compat/comments-popup.php
r14771 r15843 4 4 * @subpackage Theme_Compat 5 5 * @deprecated 3.0 6 * 6 * 7 7 * This file is here for Backwards compatibility with old themes and will be removed in a future version 8 * 8 * 9 9 */ 10 10 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); -
trunk/wp-includes/theme-compat/comments.php
r14983 r15843 4 4 * @subpackage Theme_Compat 5 5 * @deprecated 3.0 6 * 6 * 7 7 * This file is here for Backwards compatibility with old themes and will be removed in a future version 8 * 8 * 9 9 */ 10 10 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); … … 13 13 if (!empty($_SERVER['SCRIPT_FILENAME']) && 'comments.php' == basename($_SERVER['SCRIPT_FILENAME'])) 14 14 die ('Please do not load this page directly. Thanks!'); 15 15 16 16 if ( post_password_required() ) { ?> 17 <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 17 <p class="nocomments"><?php _e('This post is password protected. Enter the password to view comments.'); ?></p> 18 18 <?php 19 19 return; … … 59 59 <h3><?php comment_form_title( __('Leave a Reply'), __('Leave a Reply to %s' ) ); ?></h3> 60 60 61 <div id="cancel-comment-reply"> 61 <div id="cancel-comment-reply"> 62 62 <small><?php cancel_comment_reply_link() ?></small> 63 </div> 63 </div> 64 64 65 65 <?php if ( get_option('comment_registration') && !is_user_logged_in() ) : ?> … … 91 91 92 92 <p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" /> 93 <?php comment_id_fields(); ?> 93 <?php comment_id_fields(); ?> 94 94 </p> 95 95 <?php do_action('comment_form', $post->ID); ?> -
trunk/wp-includes/theme-compat/footer.php
r14771 r15843 4 4 * @subpackage Theme_Compat 5 5 * @deprecated 3.0 6 * 6 * 7 7 * This file is here for Backwards compatibility with old themes and will be removed in a future version 8 * 8 * 9 9 */ 10 10 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); -
trunk/wp-includes/theme-compat/header.php
r14366 r15843 4 4 * @subpackage Theme_Compat 5 5 * @deprecated 3.0 6 * 6 * 7 7 * This file is here for Backwards compatibility with old themes and will be removed in a future version 8 * 8 * 9 9 */ 10 10 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); -
trunk/wp-includes/theme-compat/sidebar.php
r15229 r15843 4 4 * @subpackage Theme_Compat 5 5 * @deprecated 3.0 6 * 6 * 7 7 * This file is here for Backwards compatibility with old themes and will be removed in a future version 8 * 8 * 9 9 */ 10 10 _deprecated_file( sprintf( __( 'Theme without %1$s' ), basename(__FILE__) ), '3.0', null, sprintf( __('Please include a %1$s template in your theme.'), basename(__FILE__) ) ); -
trunk/wp-includes/user.php
r15833 r15843 643 643 $order_meta = get_user_meta( $user_id, 'blog_order' ); 644 644 $visible_meta = get_user_meta( $user_id, 'blog_visibility' ); 645 645 646 646 $order = $order_meta; 647 647 if ( !is_array( $order ) ) … … 651 651 if ( !is_array( $visible ) ) 652 652 $visible = array(); 653 653 654 654 // Index the blogs by userblog_id and set the visibility flag 655 655 // Visibility is on by default, unless a linked site then off … … 668 668 if ( is_object( $id ) && isset( $id->userblog_id ) ) 669 669 $id = $id->userblog_id; 670 670 671 671 if ( is_numeric( $id ) && isset( $newblogs[intval( $id )] ) ) { 672 672 $ordered[$id] = $newblogs[$id]; … … 725 725 function is_blog_user( $blog_id = 0 ) { 726 726 global $wpdb; 727 727 728 728 $current_user = wp_get_current_user(); 729 729 if ( !$blog_id ) -
trunk/wp-includes/wp-db.php
r15808 r15843 541 541 /** 542 542 * Sets the connection's character set. 543 * 543 * 544 544 * @param resource $dbh The resource given by mysql_connect 545 545 * @param string $charset The character set (optional) … … 741 741 */ 742 742 function select( $db, $dbh = null) { 743 if ( is_null($dbh) ) 743 if ( is_null($dbh) ) 744 744 $dbh = $this->dbh; 745 745 … … 1044 1044 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p> 1045 1045 "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); 1046 1046 1047 1047 //If show errors is disabled then we need to die anyway as we don't have a working DB connection 1048 1048 die(); -
trunk/wp-login.php
r15782 r15843 262 262 if ( empty( $user ) ) 263 263 return new WP_Error('invalid_key', __('Invalid key')); 264 264 265 265 return $user; 266 266 }
Note: See TracChangeset
for help on using the changeset viewer.