Ticket #11807: ms_deprecated_functions.11807.diff

wp-includes/ms-functions.php

@@ -1831 +1831 @@
 
         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 );

xmlrpc.php

@@ -443 +443 @@
          */
         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 );
                 }

wp-admin/ms-edit.php

@@ -513 +513 @@
                         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 ) {

wp-admin/load-styles.php

@@ -19 +19 @@
 /**
  * @ignore
  */
-function _c() {}
-
-/**
- * @ignore
- */
 function _x() {}
 
 

wp-admin/load-scripts.php

@@ -19 +19 @@
 /**
  * @ignore
  */
-function _c() {}
-
-/**
- * @ignore
- */
 function _x() {}