Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 12646)
+++ wp-includes/ms-functions.php	(working copy)
@@ -1831,7 +1831,7 @@
 
 	function plugin_content() {
 		global $current_blog, $current_site;
-		$this->delete_blog_hash = get_settings('delete_blog_hash');
+		$this->delete_blog_hash = get_option('delete_blog_hash');
 		echo '<div class="wrap"><h2>' . __('Delete Blog') . '</h2>';
 		if( $_POST['action'] == "deleteblog" && $_POST['confirmdelete'] == '1' ) {
 			$hash = substr( md5( $_SERVER['REQUEST_URI'] . time() ), 0, 6 );
Index: xmlrpc.php
===================================================================
--- xmlrpc.php	(revision 12646)
+++ xmlrpc.php	(working copy)
@@ -443,7 +443,7 @@
 	 */
 	function wp_getUsersBlogs( $args ) {
 		// If this isn't on WPMU then just use blogger_getUsersBlogs
-		if( !function_exists( 'is_site_admin' ) ) {
+		if( is_multisite() ) {
 			array_unshift( $args, 1 );
 			return $this->blogger_getUsersBlogs( $args );
 		}
Index: wp-admin/ms-edit.php
===================================================================
--- wp-admin/ms-edit.php	(revision 12646)
+++ wp-admin/ms-edit.php	(working copy)
@@ -513,7 +513,7 @@
 			wp_die( __('Missing email.') );
 		}
 
-		$password = generate_random_password();
+		$password = wp_generate_password();
 		$user_id = wpmu_create_user(wp_specialchars( strtolower( $user['username'] ) ), $password, wp_specialchars( $user['email'] ) );
 
 		if( false == $user_id ) {
Index: wp-admin/load-styles.php
===================================================================
--- wp-admin/load-styles.php	(revision 12646)
+++ wp-admin/load-styles.php	(working copy)
@@ -19,11 +19,6 @@
 /**
  * @ignore
  */
-function _c() {}
-
-/**
- * @ignore
- */
 function _x() {}
 
 
Index: wp-admin/load-scripts.php
===================================================================
--- wp-admin/load-scripts.php	(revision 12646)
+++ wp-admin/load-scripts.php	(working copy)
@@ -19,11 +19,6 @@
 /**
  * @ignore
  */
-function _c() {}
-
-/**
- * @ignore
- */
 function _x() {}
 
 
