Index: /branches/release-35/lib/MT/CMS/Search.pm
===================================================================
--- /branches/release-35/lib/MT/CMS/Search.pm (revision 1866)
+++ /branches/release-35/lib/MT/CMS/Search.pm (revision 1960)
@@ -19,5 +19,5 @@
           or return $app->error( $app->translate("No permissions") );
     }
-    return {
+    my $types = {
         'entry' => {
             'order' => 100,
@@ -255,5 +255,5 @@
         }
     };
-
+    return $types;
 }
 
@@ -293,9 +293,11 @@
       qw( search replace do_replace case is_regex is_limited _type is_junk is_dateranged replace_ids datefrom_year datefrom_month datefrom_day dateto_year dateto_month dateto_day from to show_all do_search orig_search quicksearch );
 
-
     if ( !$type || ( 'category' eq $type ) || ( 'folder' eq $type ) ) {
         $type = 'entry';
     }
-    
+    if ( ( 'user' eq $type ) ) {
+        $type = 'author';
+    }
+
     foreach my $obj_type (qw( role association )) {
         if ( $type eq $obj_type ) {
Index: /branches/release-35/lib/MT/CMS/User.pm
===================================================================
--- /branches/release-35/lib/MT/CMS/User.pm (revision 1908)
+++ /branches/release-35/lib/MT/CMS/User.pm (revision 1960)
@@ -333,5 +333,5 @@
     $param->{saved} = 1 if $app->param('saved');
     $param->{search_label} = $app->translate('Users');
-    $param->{object_type} = 'author';
+    $param->{object_type} = 'user';
 
     require MT::Association;
Index: /branches/release-35/lib/MT/App/CMS.pm
===================================================================
--- /branches/release-35/lib/MT/App/CMS.pm (revision 1934)
+++ /branches/release-35/lib/MT/App/CMS.pm (revision 1960)
@@ -2807,249 +2807,4 @@
 }
 
-sub core_search_apis {
-    my $app = shift;
-    my $q       = $app->param;
-    my $blog_id = $q->param('blog_id');
-    my $author  = $app->user;
-    my @perms;
-    if ( !$blog_id ) {
-        if ( !$author->is_superuser() ) {
-            require MT::Permission;
-            @perms = MT::Permission->load( { author_id => $author->id } );
-        }
-    }
-    else {
-        @perms = ( $app->permissions )
-          or return $app->error( $app->translate("No permissions") );
-    }
-    return {
-        'entry' => {
-            'order' => 100,
-            'permission' => 'create_post,publish_post,edit_all_posts',
-            'label' => 'Entries',
-            'perm_check' => sub {
-                grep { $_->can_edit_entry( $_[0], $author ) } @perms;
-            },
-            'search_cols' => {
-                'title' => sub { $app->translate('Title') },
-                'text' => sub { $app->translate('Entry Body') },
-                'text_more' => sub { $app->translate('Extended Entry') },
-                'keywords' => sub { $app->translate('Keywords') },
-                'excerpt' => sub { $app->translate('Excerpt') },
-                'basename' => sub { $app->translate('Basename') },
-            },
-            'replace_cols'       => [qw(title text text_more keywords excerpt)],
-            'can_replace'        => 1,
-            'can_search_by_date' => 1,
-            'date_column'        => 'authored_on',
-        },
-        'comment' => {
-            'order' => 200,
-            'permission' => 'publish_post,create_post,edit_all_posts,manage_feedback',
-            'label' => 'Comments',
-            'perm_check' => sub {
-                require MT::Entry;
-                my $entry = MT::Entry->load( $_[0]->entry_id );
-                grep { $_->can_edit_entry( $entry, $author ) } @perms;
-            },
-            'search_cols' => {
-                'url' => sub { $app->translate('URL') },
-                'text' => sub { $app->translate('Comment Text') },
-                'email' => sub { $app->translate('Email Address') },
-                'ip' => sub { $app->translate('IP Address') },
-                'author' => sub { $app->translate('Name') },
-            },
-            'replace_cols'       => [qw(text)],
-            'can_replace'        => 1,
-            'can_search_by_date' => 1,
-        },
-        'ping' => {
-            'order' => 300,
-            'permission' => 'create_post,publish_post,edit_all_posts,manage_feedback',
-            'label' => 'TrackBacks',
-            'perm_check' => sub {
-                my $ping = shift;
-                my $tb   = MT::Trackback->load( $ping->tb_id );
-                if ( $tb->entry_id ) {
-                    require MT::Entry;
-                    my $entry = MT::Entry->load( $tb->entry_id );
-                    return
-                      grep { $_->can_edit_entry( $entry, $author ) } @perms;
-                }
-                elsif ( $tb->category_id ) {
-                    return grep { $_->can_edit_categories } @perms;
-                }
-            },
-            'search_cols' => {
-                'title' => sub { $app->translate('Title') },
-                'excerpt' => sub { $app->translate('Excerpt') },
-                'source_url' => sub { $app->translate('Source URL') },
-                'ip' => sub { $app->translate('IP Address') },
-                'blog_name' => sub { $app->translate('Blog Name') },
-            },
-            'replace_cols'       => [qw(title excerpt)],
-            'can_replace'        => 1,
-            'can_search_by_date' => 1,
-        },
-        'page' => {
-            'order' => 400,
-            'permission' => 'manage_pages',
-            'label' => 'Pages',
-            'perm_check' => sub {
-                grep { $_->can_manage_pages( $_[0], $author ) } @perms;
-            },
-            'search_cols' => {
-                'title' => sub { $app->translate('Title') },
-                'text' => sub { $app->translate('Page Body') },
-                'text_more' => sub { $app->translate('Extended Page') },
-                'keywords' => sub { $app->translate('Keywords') },
-                'excerpt' => sub { $app->translate('Excerpt') },
-                'basename' => sub { $app->translate('Basename') },
-            },
-            'replace_cols'       => [qw(title text text_more keywords excerpt)],
-            'can_replace'        => 1,
-            'can_search_by_date' => 1,
-            'date_column'        => 'authored_on',
-            'results_table_template' => '<mt:include name="include/entry_table.tmpl">',
-        },
-        'template' => {
-            'order'         => 500,
-            'permission'    => 'edit_templates',
-            'label'         => 'Templates',
-            'perm_check' => sub {
-                my ($obj) = @_;
-
-                # are there any perms that match this object and
-                # allow template editing?
-                my @check = grep {
-                         $_->blog_id == $obj->blog_id
-                      && $_->can_edit_templates
-                } @perms;
-                return @check;
-
-            },
-            'search_cols' => {
-                'name' => sub { $app->translate('Template Name') },
-                'text' => sub { $app->translate('Text') },
-                'linked_file' => sub { $app->translate('Linked Filename') },
-                'outfile' => sub { $app->translate('Output Filename') },
-            },
-            'replace_cols'       => [qw(name text linked_file outfile)],
-            'can_replace'        => 1,
-            'can_search_by_date' => 0,
-        },
-        'asset' => {
-            'order' => 600,
-            'permission' => 'manage_assets',
-            'label' => 'Assets',
-            'perm_check' => sub {
-                1;
-            },
-            'search_cols' => {
-                'file_name' => sub { $app->translate('Filename') },
-                'description' => sub { $app->translate('Description') },
-                'label' => sub { $app->translate('Label') },
-            },
-            'replace_cols'       => [],
-            'can_replace'        => 0,
-            'can_search_by_date' => 1,
-            'setup_terms_args'   => sub {
-                my ($terms, $args, $blog_id) = @_;
-                $terms->{class} = '*';
-                $terms->{blog_id} = $blog_id if $blog_id;
-            }
-        },
-        'log' => {
-            'order' => 700,
-            'permission'        => "view_blog_log",
-            'system_permission' => "view_log",
-            'label' => 'Activity Log',
-            'perm_check' => sub {
-                my ($obj) = @_;
-                return 1 if $author->can_view_log;
-                my $perm = $author->permissions( $obj->blog_id );
-                return $perm->can_view_blog_log;
-            },
-            'search_cols' => {
-                'ip' => sub { $app->translate('Log Message') },
-                'message' => sub { $app->translate('IP Address') },
-            },
-            'can_replace'        => 0,
-            'can_search_by_date' => 1,
-            'setup_terms_args'   => sub {
-                my ($terms, $args, $blog_id) = @_;
-                $terms->{class} = '*';
-                $terms->{blog_id} = $blog_id if $blog_id;
-            }
-        },
-        'author' => {
-            'order' => 800,
-            'system_permission' => 'administer',
-            'label' => 'Users',
-            'perm_check' => sub {
-                return 1 if $author->is_superuser;
-                if ($blog_id) {
-                    my $perm = $author->permissions($blog_id);
-                    return $perm->can_administer_blog;
-                }
-                return 0;
-            },
-            'search_cols' => {
-                'name'     => sub { $app->translate('Username') },
-                'nickname' => sub { $app->translate('Display Name') },
-                'email'    => sub { $app->translate('Email Address') },
-                'url'      => sub { $app->translate('URL') },
-            },
-            'can_replace'        => 0,
-            'can_search_by_date' => 0,
-            'setup_terms_args'   => sub {
-                my ($terms, $args, $blog_id) = @_;
-                if ($blog_id) {
-                    $args->{'join'} =
-                      MT::Permission->join_on( 'author_id',
-                        { blog_id => $blog_id } );
-                }
-                else {
-                    $terms->{'type'} = MT::Author::AUTHOR();
-                }
-            },
-            'results_table_template' => '
-<mt:if name="blog_id">
-    <mt:include name="include/member_table.tmpl">
-<mt:else>
-    <mt:include name="include/author_table.tmpl">
-</mt:if>',
-        },
-        'blog' => {
-            'order' => 900,
-            'system_permission' => 'administer',
-            'label' => 'Blogs',
-            'perm_check' => sub {
-                return 1 if $author->is_superuser;
-                my ($obj) = @_;
-                my $perm = $author->permissions( $obj->id );
-                $perm
-                  && ( $perm->can_administer_blog || $perm->can_edit_config );
-            },
-            'search_cols' => {
-                'name' => sub { $app->translate('Name') },
-                'site_url' => sub { $app->translate('Site URL') },
-                'site_path' => sub { $app->translate('Site Root') },
-                'description' => sub { $app->translate('Description') },
-            },
-            'replace_cols'       => [qw(name site_url site_path description)],
-            'can_replace'        => $author->is_superuser(),
-            'can_search_by_date' => 0,
-            'view'               => 'system',
-            'setup_terms_args'   => sub {
-                my ($terms, $args, $blog_id) = @_;
-                $args->{sort}      = 'name';
-                $args->{direction} = 'ascend';
-            }
-        }
-    };
-
-}
-
 sub add_to_favorite_blogs {
     my $app = shift;