Context Navigation

← Previous Changeset
Next Changeset →

Changeset 12699

Timestamp:

01/11/2010 10:23:58 PM (17 years ago)

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

: 4 edited

author-template.php (modified) (1 diff)
capabilities.php (modified) (1 diff)
taxonomy.php (modified) (1 diff)
user.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/wp-includes/author-template.php

-              r12697
+              r12699
         /** @todo Move select to get_authors(). */
+        if( is_multisite() ) {
+                $users = get_users_of_blog();
+                $author_ids = array();
+                foreach ( (array) $users as $user ) {
+                        $author_ids[] = $user->user_id;
+                }
+                if ( count($author_ids) > 0  ) {
+                        $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" );
+                } else {
+                        $authors = array();
+                }
+        } else {
+                $authors = $wpdb->get_results("SELECT ID, user_nicename from $wpdb->users " . ($exclude_admin ? "WHERE user_login <> 'admin' " : '') . "ORDER BY display_name");
+        }
+        $users = get_users_of_blog();
+        $author_ids = array();
+        foreach ( (array) $users as $user )
+                $author_ids[] = $user->user_id;
+        if ( count($author_ids) > 0  ) {
+                $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" );
+        } else {
+                $authors = 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;
+        }
         foreach ( (array) $authors as $author ) {

trunk/wp-includes/capabilities.php

-              r12697
+              r12699
         $current_user = wp_get_current_user();
         if( is_multisite() && is_super_admin() )
                 return true;
+    if ( is_multisite() && is_super_admin() )
+                return true;
         if ( empty( $current_user ) )

trunk/wp-includes/taxonomy.php

-              r12697
+              r12699
         if ( ! $term_id = is_term($slug) ) {
                 if ( !is_multisite() ) {
                         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);
                         $term_id = (int) $wpdb->insert_id;
                 } else {
                         $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
                         $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
                         if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
                                 return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
+                if ( !is_multisite() ) {
+                        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);
+                        $term_id = (int) $wpdb->insert_id;
+                } else {
+                        $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+                        $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id', 'name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
         } else if ( is_taxonomy_hierarchical($taxonomy) && !empty($parent) ) {
                 // If the taxonomy supports hierarchy and the term has a parent, make the slug unique
                 // by incorporating parent slugs.
                 $slug = wp_unique_term_slug($slug, (object) $args);
                 if( !is_multisite() ) {
                         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);
                         $term_id = (int) $wpdb->insert_id;
                 } else {
                         $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
                         $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
                         if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
                                 return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
+                $slug = wp_unique_term_slug($slug, (object) $args);
+                if ( !is_multisite() ) {
+                        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);
+                        $term_id = (int) $wpdb->insert_id;
+                } else {
+                        $maxterm = $wpdb->get_var( "SELECT max(term_id) FROM {$wpdb->terms}" );
+                        $term_id = mt_rand( $maxterm+100, $maxterm+4000 );
+                        if ( false === $wpdb->insert( $wpdb->terms, compact( 'term_id','name', 'slug', 'term_group' ) ) )
+                                return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);
+                }
+        }

trunk/wp-includes/user.php

r12697	r12699
280	280	if ( empty($id) )
281	281	$id = (int) $blog_id;
282		$blog_prefix = $wpdb->get_blog_prefix($id);
	282	$blog_prefix = $wpdb->get_blog_prefix($id);
283	283	$users = $wpdb->get_results( "SELECT user_id, user_id AS ID, user_login, display_name, user_email, meta_value FROM $wpdb->users, $wpdb->usermeta WHERE {$wpdb->users}.ID = {$wpdb->usermeta}.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY {$wpdb->usermeta}.user_id" );
284	284	return $users;

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core