Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-16 15:46:04 +01:00
Code Issues Projects Releases Wiki Activity

Mainstream things that don't need to be multisite only. Formatting cleanups. see #11644

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-11 22:23:58 +00:00
parent d24ac0a095
commit b4447f9f9c
4 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/author-template.php
View File

@ -269,26 +269,20 @@ function wp_list_authors($args = '') {
$return = ''; $return = '';
/** @todo Move select to get_authors(). */ /** @todo Move select to get_authors(). */
if( is_multisite() ) {
$users = get_users_of_blog(); $users = get_users_of_blog();
$author_ids = array(); $author_ids = array();
foreach ( (array) $users as $user ) { foreach ( (array) $users as $user )
$author_ids[] = $user->user_id; $author_ids[] = $user->user_id;
}
if ( count($author_ids) > 0 ) { if ( count($author_ids) > 0 ) {
$author_ids=implode(',', $author_ids ); $author_ids = implode(',', $author_ids );
$authors = $wpdb->get_results( "SELECT ID, user_nicename from $wpdb->users WHERE ID IN($author_ids) " . ($exclude_admin ? "AND user_login <> 'admin' " : '') . "ORDER BY display_name" ); $authors = $wpdb->get_results( "SELECT ID, user_nicename from $wpdb->users WHERE ID IN($author_ids) " . ($exclude_admin ? "AND user_login <> 'admin' " : '') . "ORDER BY display_name" );
} else { } else {
$authors = array(); $authors = array();
} }
} else {
$authors = $wpdb->get_results("SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name");
}
$author_count = array(); $author_count = array();
foreach ((array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author") as $row) { foreach ( (array) $wpdb->get_results("SELECT DISTINCT post_author, COUNT(ID) AS count FROM $wpdb->posts WHERE post_type = 'post' AND " . get_private_posts_cap_sql( 'post' ) . " GROUP BY post_author") as $row )
$author_count[$row->post_author] = $row->count; $author_count[$row->post_author] = $row->count;
}
foreach ( (array) $authors as $author ) { foreach ( (array) $authors as $author ) {

2
wp-includes/capabilities.php
View File

@ -987,7 +987,7 @@ function map_meta_cap( $cap, $user_id ) {
function current_user_can( $capability ) { function current_user_can( $capability ) {
$current_user = wp_get_current_user(); $current_user = wp_get_current_user();
if( is_multisite() && is_super_admin() ) if ( is_multisite() && is_super_admin() )
return true; return true;
if ( empty( $current_user ) ) if ( empty( $current_user ) )

2
wp-includes/taxonomy.php
View File

@ -1431,7 +1431,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
// If the taxonomy supports hierarchy and the term has a parent, make the slug unique // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
// by incorporating parent slugs. // by incorporating parent slugs.
$slug = wp_unique_term_slug($slug, (object) $args); $slug = wp_unique_term_slug($slug, (object) $args);
if( !is_multisite() ) { if ( !is_multisite() ) {
if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error); return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
$term_id = (int) $wpdb->insert_id; $term_id = (int) $wpdb->insert_id;